Merge branch 'search-limit-offset-type' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Thu, 11 Jul 2019 13:55:31 +0000 (13:55 +0000)
committerkaniini <ariadne@dereferenced.org>
Thu, 11 Jul 2019 13:55:31 +0000 (13:55 +0000)
commitdb75288b71e7531f8e5033f56fc0b9a7d1d8efb3
tree78eb45470cbf05740cbd3ec5168fb7c474beca95
parent4d382d13478deafbbb9bff1ea5a60fc4a2316b11
parent4198c3ac390edaab04a61a179b1f8bc5adaf89de
Merge branch 'search-limit-offset-type' into 'develop'

Add account_id, type, limit, and offset to GET /api/v1/search and /api/v2/search

See merge request pleroma/pleroma!1386