Merge branch 'fix/prune-objects-times-out' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 22 May 2019 17:19:51 +0000 (17:19 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 22 May 2019 17:19:51 +0000 (17:19 +0000)
commit0b4f569c5ba10be61733d37f0be9bee5af693daf
treeccd6e9060bc0b527732fbded1e797660c0ca588a
parent83ca12f45edf3a2bc863246e5c730b5a44acae3d
parent54e10a3e55fe46b71ef7f330605baf8bcccd5a44
Merge branch 'fix/prune-objects-times-out' into 'develop'

Disable timeouts for object pruning query

See merge request pleroma/pleroma!1193