From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Mon, 19 Jun 2017 09:36:21 +0000 (+0000)
Subject: Merge branch 'vagrantfile-box' into 'master'
X-Git-Tag: 0.8~35
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=26a4e33a7a9d7480866cc7322fc31b0b6cf1ccc9;p=fdroidserver.git

Merge branch 'vagrantfile-box' into 'master'

Copy initial buildserver CPU/memory configuration to final box Vagrantfile

See merge request !279
---

26a4e33a7a9d7480866cc7322fc31b0b6cf1ccc9