chiark / gitweb /
~ianmdlvl / fdroidserver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 18db382 c08d209)
Merge branch 'update-vagrantfile' into 'master'
authorCiaran Gultnieks <ciaran@ciarang.com>
Fri, 7 Nov 2014 14:44:58 +0000 (14:44 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Fri, 7 Nov 2014 14:44:58 +0000 (14:44 +0000)
commit05c2d18709ee4b2921a2ea50926dcaaa51a89e59
tree02e678a7ada685844da79e6dc5fd085d94c4aa0btree | snapshot
parent18db382c47641f094bb231b34e72ef8be00aa1a8commit | diff
parentc08d2092f6eccd9bced715786568c9cb0eedd10bcommit | diff
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
docs/fdroid.texi diff1 | diff2 | blob | history
makebuildserver diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.