Merge branch 'develop' into feature/mstdn-direct-api
authorcsaurus <csaurus@mailbox.org>
Tue, 22 May 2018 00:19:37 +0000 (20:19 -0400)
committercsaurus <csaurus@mailbox.org>
Tue, 22 May 2018 00:19:37 +0000 (20:19 -0400)
commit4fd9df100f61dfe4731934eca86500472d866f60
tree736ff0c55cde3890018a189edb8993ce4dead80b
parentd0ad13c12e1410e7a11d5a5f7f5b84cad5f77732
parentb4064dfe30b792f5d6d36b72c7cd530afb1c667a
Merge branch 'develop' into 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/web/mastodon_api/mastodon_api_controller_test.exs