From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Fri, 7 Jul 2017 11:02:32 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.8~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=70858bb104c8c81f1b0887eb2e2f8185ac062852;p=fdroidserver.git

Merge branch 'master' into 'master'

Also search for apk in build/outputs/apk/release

See merge request !303
---

70858bb104c8c81f1b0887eb2e2f8185ac062852