Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
authorMaxim Filippov <colixer@gmail.com>
Thu, 14 Nov 2019 14:45:29 +0000 (23:45 +0900)
committerMaxim Filippov <colixer@gmail.com>
Thu, 14 Nov 2019 14:45:29 +0000 (23:45 +0900)
commit114930b5fd816657c21c5fbe33845fd3742c9c23
tree8048239cc3562033dba47db9308159c25a177c18
parent30af5da33043192dff626e869f2628ffc709f836
parent09b4f7269e5307f29fc8ca7b548e93cd93836dc5
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs