Thibaut Girka f8e07ca5cd 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
fonts
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
mailer.scss	Separate font-family into variable (#8763)	2018-09-23 20:41:24 +02:00
mastodon-light.scss
win95.scss