Merge branch 'chore/merge-search-into-list-users' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 6 Mar 2019 22:27:42 +0000 (22:27 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 6 Mar 2019 22:27:42 +0000 (22:27 +0000)
commit0fe715f3ba0f787154ab8e86c8745d7f09affdcb
tree3560d668fe7feec0dcce59858ee4e7a6fdd54e18
parent39b766cc43c39dbff84cb498c4b4c764abdec9a0
parent76160122f6d7bf52aee929328acb4d216e4c3504
Merge branch 'chore/merge-search-into-list-users' into 'develop'

Merge search endpoint into /users

See merge request pleroma/pleroma!898
lib/pleroma/web/router.ex