Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		2019-10-27 12:14:01 +01:00
..
contrast	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
fonts	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
mastodon-light	Fix media editing modal and profile directory in light theme (#12059)	2019-10-03 03:17:29 +02:00
application.scss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
contrast.scss	…
mailer.scss	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
mastodon-light.scss	…
win95.scss	Fix syntax errors in win95 SCSS file	2019-01-02 15:36:59 +01:00