Merge branch 'develop' into feature/admin-api-user-statuses
authorMaxim Filippov <colixer@gmail.com>
Thu, 18 Jul 2019 20:38:38 +0000 (23:38 +0300)
committerMaxim Filippov <colixer@gmail.com>
Thu, 18 Jul 2019 20:38:38 +0000 (23:38 +0300)
commit9570a5be405c4cf4f07907eab4ced21e07fa20c9
tree9575741206d0604e74ab2d8f719c3da0a3002b1d
parent418ae6638d64c915ce4dae742dd493f43c8025d8
parent16cfee708ec8e9c6cbbeb15432127c7757c5c173
Merge branch 'develop' into feature/admin-api-user-statuses
CHANGELOG.md
lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs