Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		2020-11-08 14:20:35 +01:00
..
contrast	Fix unreadable placeholder text color in high contrast theme in web UI (#14803)	2020-09-15 09:24:24 +02:00
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
mastodon-light	Add duration parameter to muting. (#13831)	2020-10-13 01:01:14 +02:00
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss