Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml		2018-05-19 22:41:10 +02:00
..
contrast	Fix text colors (#7227)	2018-04-22 14:29:40 +02:00
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
application.scss	…
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss	…
mastodon-light.scss	Add a light theme	2018-05-04 20:25:58 +02:00
win95.scss	…