ee1de4206a
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
---|---|---|
.. | ||
assets.rake | ||
auto_annotate_models.rake | ||
branding.rake | ||
db.rake | ||
emojis.rake | ||
glitchsoc.rake | ||
mastodon.rake | ||
repo.rake | ||
statistics.rake | ||
tests.rake |