Merge branch 'develop' into feature/return-link-for-password-reset
authorMaxim Filippov <colixer@gmail.com>
Tue, 24 Sep 2019 10:00:48 +0000 (13:00 +0300)
committerMaxim Filippov <colixer@gmail.com>
Tue, 24 Sep 2019 10:00:48 +0000 (13:00 +0300)
commit5e9759cd7d0730c14bcc44e9b3dbda94947d602f
tree5917d89cad99d14a246e33f3e8ebd56e70abe20b
parent79c3443b609663ab23a4353ebdb7e5e2f0e6a150
parent29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965
Merge branch 'develop' into feature/return-link-for-password-reset
CHANGELOG.md
docs/api/admin_api.md
lib/pleroma/web/admin_api/admin_api_controller.ex
test/web/admin_api/admin_api_controller_test.exs