Merge branch 'develop' into feature/relay-list
authorMaxim Filippov <colixer@gmail.com>
Fri, 18 Oct 2019 08:24:29 +0000 (10:24 +0200)
committerMaxim Filippov <colixer@gmail.com>
Fri, 18 Oct 2019 08:24:29 +0000 (10:24 +0200)
commit2473702be22a44070fcff439ac901f5b9bb0586a
tree31b6180315fad80c41f551adf3ece4dcebf71f74
parent751513b6df0c76ad14026c70e1bf2635053bfea4
parent7511f3d192bff285d0ca22c03cd9a46fd552cdde
Merge branch 'develop' into feature/relay-list
CHANGELOG.md
docs/API/admin_api.md
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs