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.		2019-08-29 12:07:50 +02:00
..
contrast
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-29 12:07:50 +02:00
mastodon-light	Fix more visual issues with the audio player (#11654)	2019-08-25 15:09:19 +02:00
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss