Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb

2019-09-30 12:23:57 +02:00

..

exports

…

migration

…

preferences

…

two_factor_authentication

…

aliases_controller.rb

…

applications_controller.rb

…

base_controller.rb

…

deletes_controller.rb

…

exports_controller.rb

…

featured_tags_controller.rb

…

flavours_controller.rb

…

identity_proofs_controller.rb

…

imports_controller.rb

…

migrations_controller.rb

…

preferences_controller.rb

…

profiles_controller.rb

…

sessions_controller.rb

…

two_factor_authentications_controller.rb

…