Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.

2018-08-24 15:10:34 +02:00

..

admin_settings.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-24 15:10:34 +02:00

admin_suspension_confirmation.rb

Add confirmation step to account suspensions (#8353)

2018-08-22 11:53:41 +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

Get rid of all batch order warnings (#8334)

2018-08-21 12:25:50 +02: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