Thibaut Girka dae5e446fe Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.		2020-02-09 12:15:55 +01:00
..
contrast
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-09 12:15:55 +01:00
mastodon-light
application.scss
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss
mastodon-light.scss
win95.scss	Fix syntax errors in win95 SCSS file	2019-01-02 15:36:59 +01:00