ee1de4206a
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 |
ee1de4206a
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 |