Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system		2019-05-10 17:09:12 +02:00
..
account_batch.rb	Add batch actions for approving and rejecting pending accounts (#10469)	2019-04-06 17:53:45 +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	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	2018-01-22 14:25:09 +01:00
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