mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-01-09 05:56:59 +00:00
c48ec9cb8c
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb |