chiark / gitweb /
Merge branch 'build_timeout' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Mon, 22 Jan 2018 20:49:01 +0000 (20:49 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Mon, 22 Jan 2018 20:49:01 +0000 (20:49 +0000)
commit825b8e96838e36ade591874442ac207c63a942d9
treed0002ae5643d037c3c2a87d24d398865d51960db
parent61bb74a36954a04c079f7a3415a516f5f0e09f65
parenta1a88e1c6aa8f01afe83aea484c770ef69f0ef06
Merge branch 'build_timeout' into 'master'

Build timeout

See merge request fdroid/fdroidserver!437