From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Mon, 22 Jan 2018 20:49:01 +0000 (+0000)
Subject: Merge branch 'build_timeout' into 'master'
X-Git-Tag: 1.0.1~34
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=825b8e96838e36ade591874442ac207c63a942d9;p=fdroidserver.git

Merge branch 'build_timeout' into 'master'

Build timeout

See merge request fdroid/fdroidserver!437
---

825b8e96838e36ade591874442ac207c63a942d9