Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		2019-04-01 21:28:31 +02:00
..
account_batch.rb	Add relationship manager UI (#10268)	2019-03-16 11:23:22 +01:00
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
delete_confirmation.rb	Account deletion (#3728)	2017-06-14 18:01:27 +02:00
migration.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	2018-01-22 14:25:09 +01:00
status_batch.rb	Remove Form::StatusBatch::ACTION_TYPE unused (#9623)	2018-12-25 18:29:51 +01:00
two_factor_confirmation.rb	Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)	2017-04-08 22:20:08 +02:00