John Ericson 18742471af Merge remote-tracking branch 'upstream/master' into staging ...

Use newer vagrant from master

2018-05-23 09:40:37 -04:00

..

default.nix

vagrant: 2.0.2 -> 2.1.1

2018-05-23 00:22:39 -07:00

Gemfile

vagrant: 2.0.2 -> 2.0.4

2018-04-29 19:08:42 +01:00

Gemfile.lock

vagrant: 2.0.2 -> 2.1.1

2018-05-23 00:22:39 -07:00

gemset.nix

vagrant: 2.0.2 -> 2.1.1

2018-05-23 00:22:39 -07:00

unofficial-installation-nowarn.patch

…