This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		2019-06-07 17:00:36 +02:00
..
account_batch.rb	Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)	2019-06-04 23:11:18 +02:00
admin_settings.rb	Add site-wide options to show reblogs and replies in local/public timelines	2019-05-01 22:33:09 +02:00
delete_confirmation.rb	…
migration.rb	…
status_batch.rb	Record deleted(by mod) status to prevent re-appear (#10732)	2019-05-09 22:03:02 +02:00
two_factor_confirmation.rb	…