Thibaut Girka 11cc2e099a Merge branch 'master' into glitch-soc/merge-master ... Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss		2018-05-25 18:59:02 +02:00
..
contrast	Fix text colors (#7227)	2018-04-22 14:29:40 +02:00
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-master	2018-05-25 18:59:02 +02:00
mastodon-light	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
application.scss	…
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss	…
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	…