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-10-04 12:36:53 +02:00
2018-10-04 17:38:04 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 17:38:04 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2018-08-14 20:24:47 +02:00
2018-07-15 14:56:00 +02:00
2018-08-15 20:23:12 +02:00
2018-08-16 20:30:09 +02:00
2018-07-13 02:16:06 +02:00
2018-08-09 09:56:53 +02:00
2018-08-13 18:17:20 +02:00
2018-08-14 19:19:32 +02:00
2018-10-07 04:40:37 +02:00
2018-08-14 20:24:47 +02:00
2018-08-21 20:11:34 +02:00
2018-10-07 23:44:58 +02:00
2018-10-09 19:35:14 +02:00
2018-10-17 17:13:04 +02:00
2018-10-20 08:02:44 +02:00
2018-10-19 01:47:29 +02:00
2018-10-30 21:09:33 +01:00
2018-10-26 23:08:34 +02:00
2018-11-19 00:43:52 +01:00
2018-11-19 00:43:52 +01:00
2018-11-27 13:56:25 +01:00
2018-11-28 14:46:07 +01:00
2018-12-06 17:36:11 +01:00
2018-12-06 17:36:11 +01:00
2018-12-06 17:36:11 +01:00
2018-12-06 17:36:11 +01:00
2018-12-11 05:30:57 +01:00