mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
David Yip 3550470c18
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json

The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option).  They were resolved via accept-ours.
2018-06-02 16:15:36 -05:00
..
core
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
flavours
Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks
2018-06-01 00:36:48 -05:00
fonts
Theme: Windows 95
2018-01-05 16:22:58 -08:00
images
Merge branch 'master' of https://github.com/tootsuite/mastodon
2018-02-23 23:28:31 +09:00
locales
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
mastodon
Merge remote-tracking branch 'origin/master' into gs-master
2018-06-02 16:15:36 -05:00
packs
Merge branch 'master' into glitch-soc/merge
2018-05-14 20:51:50 +02:00
skins
Port Sylvhem's mastodon-light to glitch flavour
2018-05-07 17:00:02 +02:00
styles
Merge remote-tracking branch 'origin/master' into gs-master
2018-06-02 16:15:36 -05:00