Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		2018-05-10 00:03:28 +02:00
..
contrast	Fix text colors (#7227)	2018-04-22 14:29:40 +02:00
fonts
mastodon	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +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