Thibaut Girka 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		2018-11-27 13:23:02 +01: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-11-27 13:23:02 +01:00
mastodon-light	Improve style of notice/alert messages (#8973)	2018-10-13 01:51:30 +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	Separate font-family into variable (#8763)	2018-09-23 20:41:24 +02: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