Conflicts: - `CONTRIBUTING.md`: Upstream modified it while we quote upstream's within an otherwise different file. Applied upstream's changes. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| oembed_spec.rb | ||
Conflicts: - `CONTRIBUTING.md`: Upstream modified it while we quote upstream's within an otherwise different file. Applied upstream's changes. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| oembed_spec.rb | ||