Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
2018-12-15 10:45:53 +01:00
..
2017-05-08 15:56:00 +02:00
2018-01-28 22:48:09 +09:00
2018-01-22 14:20:58 +01:00
2018-02-01 07:33:54 +09:00
2017-05-08 15:56:00 +02:00
2018-01-28 22:48:09 +09:00
2017-12-08 01:59:44 +01:00
2018-01-28 22:48:09 +09:00
2018-01-09 20:30:28 +09:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-27 13:38:03 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00
2018-11-26 15:53:27 +01:00