Merge branch 'develop' into feature/moderation-log-filters
authorMaxim Filippov <colixer@gmail.com>
Mon, 16 Sep 2019 16:44:06 +0000 (19:44 +0300)
committerMaxim Filippov <colixer@gmail.com>
Mon, 16 Sep 2019 16:44:06 +0000 (19:44 +0300)
commitdf15ed13d15db5b5a371345fcb9968b5af4100af
tree02f8834a25733ed7ee02fa9aa4dd66b606f78030
parentd1abf7a3585e4bc1ebea4f615ae2e149d5a56918
parenta58f29b826333c1ecb0907228f0e087a3ecd9778
Merge branch 'develop' into feature/moderation-log-filters
CHANGELOG.md
lib/pleroma/user/info.ex
test/web/admin_api/admin_api_controller_test.exs