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-05-13 21:20:45 +02:00
2019-10-24 22:44:42 +02:00
2020-06-14 22:29:40 +02:00
2020-06-24 10:25:32 +02:00
2020-04-12 13:38:00 +02:00
2019-11-13 23:02:10 +01:00
2019-11-11 00:05:02 +02:00
2020-06-24 15:33:41 +02:00
2020-03-31 19:40:23 +02:00
2020-01-22 16:26:47 +01:00
2020-03-09 09:13:21 +01:00
2020-06-10 21:56:14 +02:00
2020-03-08 16:02:36 +01:00
2020-04-12 13:38:00 +02:00
2020-06-14 22:29:40 +02:00
2020-06-14 22:29:40 +02:00
2019-10-06 22:11:17 +02:00
2020-03-25 22:39:55 +01:00
2020-05-23 05:46:29 +02:00
2020-02-03 01:53:09 +01:00
2020-06-09 10:32:32 +02:00
2020-03-08 16:02:36 +01:00
2020-04-12 13:38:00 +02:00
2019-12-01 17:25:29 +01:00
2020-05-10 10:36:18 +02:00
2020-03-08 16:02:36 +01:00
2020-04-18 21:52:39 +02:00
2020-06-24 10:25:32 +02:00
2020-06-23 16:01:34 +02:00
2020-06-24 10:25:32 +02:00