From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Mon, 13 Feb 2017 21:06:18 +0000 (+0000)
Subject: Merge branch 'ossjfrog' into 'master'
X-Git-Tag: 0.8~126
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fc433c803b71edff89ce090bcdc7c9e326c355d5;p=fdroidserver.git

Merge branch 'ossjfrog' into 'master'

scanner: allow oss.jfrog.org/artifactory/oss-snapshot-local

See merge request !208
---

fc433c803b71edff89ce090bcdc7c9e326c355d5