993d0a9950
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. |
||
|---|---|---|
| .. | ||
| actions | ||
| _actions.html.haml | ||
| _media_attachments.html.haml | ||
| _status.html.haml | ||
| index.html.haml | ||
| show.html.haml | ||