Thibaut Girka dbe311f0e9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/simple_form.pl.yml		2019-01-16 14:20:07 +01:00
..
contrast	…
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-16 14:20:07 +01:00
mastodon-light	Improve style of notice/alert messages (#8973)	2018-10-13 01:51:30 +02:00
application.scss	Add new first-time tutorial (#9531)	2018-12-17 11:07:17 +01:00
contrast.scss	…
mailer.scss	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
mastodon-light.scss	…
win95.scss	Fix syntax errors in win95 SCSS file	2019-01-02 15:36:59 +01:00