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
..
_action_log.html.haml
_status.html.haml	Add soft delete for statuses for instant deletes through API (#11623)	2019-08-22 21:55:56 +02:00
index.html.haml
show.html.haml