Thibaut Girka aae60a2366 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.		2020-06-24 15:33:41 +02:00
..
contrast
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +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