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