f5b7307890
Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb |
f5b7307890
Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb |