]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db01f8b 8b8004a)
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 20 Nov 2020 12:27:48 +0000 (13:27 +0100)
committerThibaut Girka <thib@sitedethib.com>
Fri, 20 Nov 2020 12:27:48 +0000 (13:27 +0100)
commit48f0f3ffeeb2b3dfb8af7d4d0fba3b64697d125c
tree665a41c2543505b75b24b41761bc5d0ff9e9b458tree | snapshot
parentdb01f8b942b72eaa2eacbb144261b002f8079c9ccommit | diff
parent8b8004a9626442ae31e4dffd79e874e9cde050c6commit | 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.
.github/ISSUE_TEMPLATE/bug_report.md diff1 | diff2 | blob | history
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
config/routes.rb diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon