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
..
contrast
fonts
mastodon	Merge remote-tracking branch 'origin/master' into gs-master	2018-06-02 16:15:36 -05:00
mastodon-light	Fix embed, error and onboarding modals in light theme (#7656)	2018-05-28 19:13:20 +02:00
application.scss
contrast.scss
mailer.scss
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss