Merge branch 'develop' into feature/admin-api-user-statuses
authorMaxim Filippov <colixer@gmail.com>
Sat, 13 Jul 2019 21:39:06 +0000 (00:39 +0300)
committerMaxim Filippov <colixer@gmail.com>
Sat, 13 Jul 2019 21:39:06 +0000 (00:39 +0300)
commit418ae6638d64c915ce4dae742dd493f43c8025d8
tree88dab25ac8f569c2a7c12300be79f6cbd8357afe
parenta9459ff98f0af590931ef279c2bc7efb0cceac5a
parent592411e4fe8a1cf39064e3dd5f9312ed5cdcd22e
Merge branch 'develop' into feature/admin-api-user-statuses
CHANGELOG.md
lib/pleroma/web/router.ex