projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcadf34 5184b0f)
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)
Handle search timeouts for /api/v1/search and /api/v2/search

Closes #994

See merge request pleroma/pleroma!1369


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git