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
flavours	Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks	2018-06-01 00:36:48 -05:00
fonts
images
locales
mastodon	Merge remote-tracking branch 'origin/master' into gs-master	2018-06-02 16:15:36 -05:00
packs
skins
styles	Merge remote-tracking branch 'origin/master' into gs-master	2018-06-02 16:15:36 -05:00