Merge branch 'develop' into feature/moderation-log-filters
authorMaxim Filippov <colixer@gmail.com>
Thu, 26 Sep 2019 16:01:54 +0000 (19:01 +0300)
committerMaxim Filippov <colixer@gmail.com>
Thu, 26 Sep 2019 16:01:54 +0000 (19:01 +0300)
commite7836adf21421de7a6d1d84fd605ec7d7f207cda
treeca378665486e37ec82a19feb95c84d2131b83e7a
parentdf15ed13d15db5b5a371345fcb9968b5af4100af
parent6abe12dceda8d0d32878208987a9631d5d546a3d
Merge branch 'develop' into feature/moderation-log-filters
CHANGELOG.md
lib/pleroma/user/info.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
test/web/admin_api/admin_api_controller_test.exs