merge develop
authorRoman Chvanikov <chvanikoff@pm.me>
Mon, 8 Jun 2020 16:21:07 +0000 (19:21 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Mon, 8 Jun 2020 16:21:07 +0000 (19:21 +0300)
commit604a83ae3efe21b231fb524203a883a062102546
tree610d04900503ec700fe7307fb73fd90bb5865009
parent1be6b3056e97654612f377eaf3c8d80de6d8d77f
parentd1924926585a477682b8fcc3176521dacb0766dd
merge develop
CHANGELOG.md
docs/API/admin_api.md
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
test/web/admin_api/controllers/admin_api_controller_test.exs