Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml		2019-08-07 13:56:48 +02:00
..
contrast	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
fonts	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
mastodon-light	Fix more issues in the light theme (#10996)	2019-06-08 22:32:59 +02:00
application.scss	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Fix syntax errors in win95 SCSS file	2019-01-02 15:36:59 +01:00