Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Sat, 30 May 2020 10:31:12 +0000 (12:31 +0200)
committerlain <lain@soykaf.club>
Sat, 30 May 2020 10:31:12 +0000 (12:31 +0200)
commit6ff079ca9f1869ecc0789f8d684e8ea2959ccf1e
tree512ef8d0f3d1707d5078a04a229ede65175ab879
parent8bdf18d7c10f0e740b2f5e0fa5063c522b8b3872
parentb004c427a073f0f5f187f5978de416c0fae96ab8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
docs/API/differences_in_mastoapi_responses.md
lib/pleroma/web/activity_pub/builder.ex
lib/pleroma/web/activity_pub/side_effects.ex
lib/pleroma/web/streamer/streamer.ex
test/web/streamer/streamer_test.exs