From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 1 Sep 2015 18:27:55 +0000 (+0000)
Subject: Merge branch 'fdroid-version' into 'master'
X-Git-Tag: 0.5.0~138
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6f05529dac5e2bcff4c3f2f856ca3f203d032073;p=fdroidserver.git

Merge branch 'fdroid-version' into 'master'

fdroid --version and shared tests between gitlab and jenkins

This adds a `fdroid --version` flag for people to easily see the exact version of fdroidserver in use.  It'll also report the version using `git describe` when running from git.

The other moves the extended tests out of `./jenkins-build` into a common script for both gitlab-ci and jenkins.

See merge request !70
---

6f05529dac5e2bcff4c3f2f856ca3f203d032073