Merge develop
authorRoman Chvanikov <chvanikoff@pm.me>
Tue, 23 Jun 2020 17:56:55 +0000 (20:56 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Tue, 23 Jun 2020 17:56:55 +0000 (20:56 +0300)
commit1471b70ef1550df91687276968108231f1bab604
tree3a59e7497d665d5ce3d6445132453518bc50601d
parent604a83ae3efe21b231fb524203a883a062102546
parentc7d69e925664ce7125c3938c298d72e94a2a1349
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