Thibaut Girka
aae60a2366
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
Conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
Conflict due to glitch-soc's theming system.
Ported upstream changes.
2020-06-24 15:33:41 +02:00
..
2020-01-27 13:44:29 +01:00
2020-05-03 22:04:18 +02:00
2020-06-09 10:28:23 +02:00
2020-01-27 13:44:29 +01:00
2020-05-03 21:23:49 +02:00
2020-04-28 10:16:55 +02:00
2018-09-18 16:45:58 +02:00
2018-04-21 21:35:55 +02:00
2020-06-24 15:33:41 +02:00
2019-11-29 17:03:38 +01:00
2019-09-02 18:11:34 +02:00
2019-06-06 18:51:46 +02:00
2020-01-27 13:44:29 +01:00
2020-05-31 20:35:18 +02:00
2019-10-06 22:11:17 +02:00
2017-11-17 19:29:16 -08:00
2018-07-09 07:13:59 +02:00
2020-04-28 10:16:55 +02:00
2019-01-24 13:32:23 +01:00
2019-10-03 03:17:41 +02:00
2020-05-13 21:20:34 +02:00
2019-10-24 22:46:59 +02:00
2019-11-13 23:02:10 +01:00
2020-05-03 22:04:18 +02:00