Merge develop
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Wed, 8 May 2019 14:34:36 +0000 (14:34 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 8 May 2019 14:34:36 +0000 (14:34 +0000)
commitbfeb33e951c8997f33a0242fe69b8e669e3afe07
treeb7bc5876873d8de83bdce72961897b5cbb852cc1
parent289b8224ac97a873569255b97f7391c2389ac3dc
Merge develop

Merge conflict in lib/pleroma/activity.ex
CHANGELOG.md
docs/api/admin_api.md
lib/pleroma/activity.ex
lib/pleroma/stats.ex
lib/pleroma/user.ex
lib/pleroma/user/query.ex [new file with mode: 0644]
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/admin_api/search.ex
test/web/admin_api/admin_api_controller_test.exs
test/web/admin_api/search_test.exs