From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Fri, 7 Nov 2014 14:44:58 +0000 (+0000)
Subject: Merge branch 'update-vagrantfile' into 'master'
X-Git-Tag: 0.3.0~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=05c2d18709ee4b2921a2ea50926dcaaa51a89e59

Merge branch 'update-vagrantfile' into 'master'

Update Vagrantfile and docs to clarify v1.4.3 is ok

Saw in the server docs that we were recommending 1.3.x and saying 1.4.x was broken. I've confirmed that 1.4.x works, and updated things accordingly. Higher version might work, but figured minimal change to build stuff was best :)

See merge request !24
---

05c2d18709ee4b2921a2ea50926dcaaa51a89e59