Merge branch 'develop' into feature/return-link-for-password-reset
authorMaxim Filippov <colixer@gmail.com>
Wed, 18 Sep 2019 13:44:11 +0000 (16:44 +0300)
committerMaxim Filippov <colixer@gmail.com>
Wed, 18 Sep 2019 13:44:11 +0000 (16:44 +0300)
commitf89728ad95ff317b68cd5bfe1d35e98e94a9f42d
treed34d669a6b12bb7731820ef1df048a3b39920f02
parentf9dd121ad3f7e1de465f81c7a5fe4e4173d88e28
parent40c968626dde499969d90f256d5ef6d1b1d5e2b4
Merge branch 'develop' into feature/return-link-for-password-reset
CHANGELOG.md
lib/pleroma/web/admin_api/admin_api_controller.ex