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-09 11:25:30 +02:00
2023-07-12 09:47:08 +02:00
2021-05-17 22:36:08 +02:00
2020-06-27 20:20:11 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-13 09:36:07 +02:00
2023-07-12 09:47:08 +02:00
2020-06-27 20:20:11 +02:00
2020-11-19 17:38:06 +01:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-30 13:15:01 +02:00
2023-07-13 09:36:07 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 16:03:05 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-13 09:36:07 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2019-10-10 06:48:53 +02:00
2020-04-03 13:06:34 +02:00
2022-10-19 22:08:10 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-13 09:36:07 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-19 09:02:49 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 10:08:51 +02:00
2023-07-12 09:47:08 +02:00
2017-06-23 18:50:53 +02:00
2023-07-12 09:47:08 +02:00
2022-10-26 12:10:48 +02:00
2023-07-12 16:03:05 +02:00
2016-12-06 17:19:26 +01:00
2023-07-12 09:47:08 +02:00
2023-06-07 01:53:50 +02:00
2021-04-09 02:31:20 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2018-10-04 12:36:53 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00