Thibaut Girka 59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency		2020-06-17 17:10:15 +02:00
..
contrast
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-17 17:10:15 +02:00
mastodon-light	Improve rendering of emoji which do not contrast with background (#13772)	2020-06-09 10:28:23 +02:00
application.scss
contrast.scss
mailer.scss	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
mastodon-light.scss
win95.scss