Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
authorlain <lain@soykaf.club>
Sat, 26 May 2018 14:00:59 +0000 (16:00 +0200)
committerlain <lain@soykaf.club>
Sat, 26 May 2018 14:00:59 +0000 (16:00 +0200)
commit4b3ec5351466f8615b32e62cc4e6215f8a80b105
treee46842eac5d8255858a113f71bdf42bfd75e4436
parent4fd9df100f61dfe4731934eca86500472d866f60
parent6138b297836f459e4fe5d21dfed30ddd9397b6d4
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex
test/support/factory.ex
test/web/mastodon_api/mastodon_api_controller_test.exs