Merge branch 'develop' into feature/return-link-for-password-reset
authorMaxim Filippov <colixer@gmail.com>
Sun, 22 Sep 2019 13:58:39 +0000 (16:58 +0300)
committerMaxim Filippov <colixer@gmail.com>
Sun, 22 Sep 2019 13:58:39 +0000 (16:58 +0300)
commit02bbcd6180702828b08a37ccf214cc3b7d5ebd24
tree73ce407b898050eeb08352ca1e8368918d1ba2bc
parentf89fe3ac06505cc07372fcdefdc3fde72d1f04a0
parent472e7b796cfeb1445ee1572df414531655b050ce
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