diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-13 17:57:15 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-13 17:57:15 +0200 |
| commit | fc500a606225b56c3da7eaebf2bfb94e9cc97d2f (patch) | |
| tree | 224cbc337acea85bd7a358fb4985f0362432cf38 /app/views/relationships | |
| parent | 82bc8e764798b74f475763136117592526d905fa (diff) | |
| parent | 31593d14269bd5f21151d70eec1031aa30ee0937 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version.
Diffstat (limited to 'app/views/relationships')
0 files changed, 0 insertions, 0 deletions