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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.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	Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)	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	…
mailer.scss	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
mastodon-light.scss	…
win95.scss	…