Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
|---|---|---|
| .. | ||
| activity | ||
| adapter_spec.rb | ||
| dereferencer_spec.rb | ||
| linked_data_signature_spec.rb | ||
| tag_manager_spec.rb | ||
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
|---|---|---|
| .. | ||
| activity | ||
| adapter_spec.rb | ||
| dereferencer_spec.rb | ||
| linked_data_signature_spec.rb | ||
| tag_manager_spec.rb | ||