Thibaut Girka 2d8be0a6e1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.		2020-07-05 19:35:56 +02:00
..
contrast
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-05 19:35:56 +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
mastodon-light.scss
win95.scss