mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 05:18:06 +01:00
57c0de949b
Conflicts: - `config/initializers/content_security_policy.rb`: Upstream changed how asset host CSP directives are used, and glitch-soc has a pretty different CSP file. It may be worth reconsidering the differences between upstream and glitch-soc but for now, just port the change. |
||
|---|---|---|
| .. | ||
| assets.rake | ||
| auto_annotate_models.rake | ||
| branding.rake | ||
| db.rake | ||
| emojis.rake | ||
| glitchsoc.rake | ||
| mastodon.rake | ||
| repo.rake | ||
| spec.rake | ||
| statistics.rake | ||
| tests.rake | ||