mastodon/app/lib/activitypub/activity
Thibaut Girka 48f0f3ffee 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.
2020-11-20 13:27:48 +01:00
..
accept.rb
add.rb
announce.rb
block.rb
create.rb
delete.rb
flag.rb
follow.rb
like.rb
move.rb
reject.rb
remove.rb
undo.rb
update.rb