Claire
993d0a9950
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream added new validations close to lines on which glitch-soc had
modified validations to handle custom limits set through environment
variables.
Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
completely different.
Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
..
2023-04-18 11:33:30 +02:00
2020-06-02 19:24:53 +02:00
2021-11-25 13:07:38 +01:00
2023-01-20 13:57:32 +01:00
2023-04-09 11:25:30 +02:00
2022-03-26 02:53:34 +01:00
2022-07-05 02:41:40 +02:00
2019-06-28 15:54:10 +02:00
2022-10-13 14:42:37 +02:00
2020-06-03 20:32:15 +02:00
2022-10-22 11:44:41 +02:00
2022-03-07 09:36:47 +01:00
2022-10-19 11:30:59 +02:00
2022-06-28 09:42:13 +02:00
2022-08-25 04:27:47 +02:00
2022-08-25 04:27:47 +02:00
2022-08-25 04:27:47 +02:00
2023-05-28 15:01:53 +02:00
2023-06-05 09:37:02 +02:00
2019-09-06 13:55:51 +02:00
2021-09-13 18:59:37 +02:00
2023-04-09 11:25:30 +02:00
2020-10-13 01:01:14 +02:00
2022-06-27 09:30:15 +02:00
2019-09-29 22:58:01 +02:00
2023-01-05 13:31:05 +01:00
2023-07-06 15:03:33 +02:00
2023-02-20 07:58:33 +01:00
2020-01-23 22:00:13 +01:00
2022-12-15 18:50:11 +01:00
2022-11-08 16:37:41 +01:00
2022-07-05 02:41:40 +02:00
2021-02-21 19:50:12 +01:00
2019-09-13 16:11:13 +02:00
2022-03-26 02:53:34 +01:00
2023-07-30 13:15:01 +02:00
2022-01-20 00:03:44 +01:00
2021-04-12 12:37:14 +02:00
2022-07-17 13:49:29 +02:00
2023-06-01 00:10:21 +02:00
2023-01-23 13:05:30 +01:00