diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-20 13:27:48 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-20 13:27:48 +0100 |
| commit | 48f0f3ffeeb2b3dfb8af7d4d0fba3b64697d125c (patch) | |
| tree | 665a41c2543505b75b24b41761bc5d0ff9e9b458 /app/views/settings/profiles/show.html.haml | |
| parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
| parent | 8b8004a9626442ae31e4dffd79e874e9cde050c6 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.
Diffstat (limited to 'app/views/settings/profiles/show.html.haml')
0 files changed, 0 insertions, 0 deletions