mastodon/app/javascript/styles
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
..
fonts Font styles are now packagified 2017-11-18 11:05:00 -08:00
mastodon Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
application.scss Replace drawer elephant graphic with a vector image (#6286) 2018-01-19 15:25:27 +01:00
mailer.scss Improve HTML e-mails based on Litmus tests (#6301) 2018-01-20 01:32:21 +01:00
win95.scss Strip trailing whitespace on win95.scss 2018-01-18 10:54:50 -06:00