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
..
account_batch.rb	Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)	6 years ago
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
delete_confirmation.rb	…
migration.rb	…
status_batch.rb	Add soft delete for statuses for instant deletes through API (#11623)	5 years ago
two_factor_confirmation.rb	…