Thibaut Girka 4dd208f482 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.		2018-09-11 16:51:26 +02:00
..
contrast	Fix text colors (#7227)	2018-04-22 14:29:40 +02:00
fonts	Font styles are now packagified	2017-11-18 11:05:00 -08:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02:00
mastodon-light	Update light theme (#8392)	2018-08-23 19:20:49 +02:00
application.scss	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss	Improve HTML e-mails based on Litmus tests (#6301)	2018-01-20 01:32:21 +01:00
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Strip trailing whitespace on win95.scss	2018-01-18 10:54:50 -06:00