From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 5 Aug 2014 21:51:52 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.3.0~101
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=27cd65fde57a48b99c677eea4b03f45d3b375a7b;p=fdroidserver.git

Merge branch 'master' into 'master'

Manual - fix name and location of sample files

It seems name and location of the sample files were changed. The documentation tells about "config.sample.py" and "makebs.config.sample.py". I did not find these while setting up the environment today.

The files are now located inside the "exmaples" directory and named as the real files.

See merge request !21
---

27cd65fde57a48b99c677eea4b03f45d3b375a7b