Merge remote-tracking branch 'upstream/develop' into admin-create-users
authorSachin Joshi <satchin.joshi@gmail.com>
Sat, 1 Jun 2019 05:57:37 +0000 (11:42 +0545)
committerSachin Joshi <satchin.joshi@gmail.com>
Sat, 1 Jun 2019 05:57:37 +0000 (11:42 +0545)
commitad5263c647aea65dbeb4c329825671895e0a8863
tree6217011a3fd2ea943498ce296de07cefe1206b87
parent5534d4c67675901ab272ee47355ad43dfae99033
parentf1890d2cacfa09dd22b06a8d041c04dbeba9e138
Merge remote-tracking branch 'upstream/develop' into admin-create-users
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs