Thibaut Girka e71b16ae2b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies.		2020-11-25 15:31:45 +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-25 15:31:45 +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