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
..
2018-12-10 21:39:25 +01:00
2018-12-15 10:45:53 +01:00
2018-12-09 16:08:04 +01:00
2018-10-30 17:52:08 +01:00
2018-12-10 21:38:01 +01:00
2018-09-11 16:51:26 +02:00
2018-12-15 10:45:53 +01:00
2018-11-13 18:55:57 +01:00
2018-11-27 13:23:02 +01:00
2018-08-24 04:33:27 +02:00
2018-12-15 10:45:53 +01:00
2018-10-26 20:41:43 +02:00
2018-10-26 20:41:43 +02:00
2018-12-06 12:44:38 +01:00
2018-11-06 15:22:44 +01:00