Merge remote-tracking branch 'origin/develop' into reactions
authorlain <lain@soykaf.club>
Sat, 5 Oct 2019 08:42:29 +0000 (10:42 +0200)
committerlain <lain@soykaf.club>
Sat, 5 Oct 2019 08:42:29 +0000 (10:42 +0200)
commitd9aaea44ff02d6a07d3be0f0675830eb51ac85ef
treece715c85f98875dd0ddf133f95a071fd40b91335
parent8e83c8423fa846e82103b20798f0cbde676354ff
parent9c47d8571c6c46503d9bb836aea933eda6e9e0a5
Merge remote-tracking branch 'origin/develop' into reactions
CHANGELOG.md
docs/API/pleroma_api.md
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/router.ex
test/web/activity_pub/activity_pub_test.exs
test/web/pleroma_api/controllers/pleroma_api_controller_test.exs