Merge branch 'handle-search-timeout' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 3 Jul 2019 10:19:51 +0000 (10:19 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 3 Jul 2019 10:19:51 +0000 (10:19 +0000)
commit079266d40658ee7042f7bc8a855485069a474ef8
treea79f9f083237d5ebfdedbff1e94c7ddf00bffa12
parentdcadf344719dcc0b0b09ae2cb97152ea67a3cec3
parent5184b0f41aabb79a47e8d3b8c76b88ca04a53b24
Merge branch 'handle-search-timeout' into 'develop'

Handle search timeouts for /api/v1/search and /api/v2/search

Closes #994

See merge request pleroma/pleroma!1369