Thibaut Girka e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.		2020-07-07 15:58:45 +02:00
..
contrast	…
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +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	…