Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
authorMaxim Filippov <colixer@gmail.com>
Sun, 24 Nov 2019 16:43:11 +0000 (01:43 +0900)
committerMaxim Filippov <colixer@gmail.com>
Sun, 24 Nov 2019 16:43:11 +0000 (01:43 +0900)
commitfd24467b923bd09850979600aeb9a46f8f0c7967
treecaed7d4448e3d89f796c92eed5c501690d8ee62a
parent114930b5fd816657c21c5fbe33845fd3742c9c23
parent937d6c6b32fc735cb5a56d9a3d97a6b2e8f37f68
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
CHANGELOG.md
lib/pleroma/web/router.ex