From: Marcus <bubu@bubu1.eu>
Date: Wed, 27 Dec 2017 19:31:50 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 1.0.0~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=195a1bbae4197a94757200b84bd56dadebf4a1d2

Merge branch 'master' into 'master'

gradle file: use flavour specific versionCode/versionName, fall back to parsing line by line

See merge request fdroid/fdroidserver!426
---

195a1bbae4197a94757200b84bd56dadebf4a1d2