Merge remote-tracking branch 'origin/develop' into conversations_three
authorlain <lain@soykaf.club>
Wed, 1 May 2019 16:40:41 +0000 (18:40 +0200)
committerlain <lain@soykaf.club>
Wed, 1 May 2019 16:40:41 +0000 (18:40 +0200)
commit45f790becc2cc63ac000c6432fe8c84e0b589822
tree724d0e8ce5f10807cc25efc2434454bf38c5a52c
parent4908e0eeee2ecb58b204198c20720d52548b6f4a
parentd107919b3d8b2275ddb7b17846cab182682098a7
Merge remote-tracking branch 'origin/develop' into conversations_three
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex
test/web/activity_pub/activity_pub_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs