Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 3 Mar 2019 15:59:15 +0000 (15:59 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 3 Mar 2019 15:59:15 +0000 (15:59 +0000)
commit6c6a2dbfdd7ae4043633c3201693c5c49538ef84
tree20797ce1b269eef2048d768cc0ea528b08a2899d
parentb531e366dfffa6b34900dd249492707bff647401
parent08c6aeeed7ff5db242050d06e707f99b6d75684d
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'

Add pagination and search to users

See merge request pleroma/pleroma!873
lib/pleroma/user.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex
lib/pleroma/web/twitter_api/views/user_view.ex
test/user_test.exs