Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code

2019-09-18 17:25:56 +02:00

..

exports

…

preferences

…

two_factor_authentication

…

applications_controller_spec.rb

…

deletes_controller_spec.rb

…

exports_controller_spec.rb

…

flavours_controller_spec.rb

…

identity_proofs_controller_spec.rb

…

imports_controller_spec.rb

…

migrations_controller_spec.rb

…

profiles_controller_spec.rb

…

sessions_controller_spec.rb

…

two_factor_authentications_controller_spec.rb

…