From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Tue, 4 Aug 2015 20:56:16 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.4.0~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=21b79cdea50f7e11862d355d9fb2c5e5decf3d6f

Merge branch 'master' into 'master'

Port README to markdown

Also add instructions for Arch-Linux.

You can take a look on it [here](https://gitlab.com/NicoAlt/fdroidserver/blob/master/README.md).

See merge request !60
---

21b79cdea50f7e11862d355d9fb2c5e5decf3d6f