Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
contrast	Fix color of static page links in high contrast theme (#10028)	2019-02-13 05:30:49 +01:00
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
mastodon-light	Disable box shadows for featured hashtags in light theme (#10034)	2019-02-13 18:33:03 +01:00
application.scss	Add polls (#10111)	2019-03-03 22:18:23 +01:00
contrast.scss
mailer.scss	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
mastodon-light.scss
win95.scss	Fix syntax errors in win95 SCSS file	2019-01-02 15:36:59 +01:00