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 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		5 years ago
..
contrast	…
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mastodon-light	Fix more visual issues with the audio player (#11654)	5 years ago
application.scss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 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	…