Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.
well-known
img-src
media-src
https:
Auth::OmniauthCallbacks
remote_interaction_helper