You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
contrast	Fix sass-lint config (#10982)	6 years ago
fonts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mastodon-light	Fix media editing modal and profile directory in light theme (#12059)	5 years ago
application.scss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Fix syntax errors in win95 SCSS file	6 years ago