Frederik Rietdijk 419bc0a4cd Revert "Revert "Merge master into staging-next"" ... In 87a19e9048 I merged staging-next into master using the GitHub gui as intended. In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master. Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master. This reverts commit 0be87c7979.		2020-02-05 19:41:25 +01:00
..
0004-Support-system-installed-plugins.patch	vagrant: Support system-installed plugins	2018-12-17 21:53:23 +11:00
default.nix	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00
gemset_libvirt.nix	vagrant: Add vagrant-libvirt to the gemset	2018-12-17 10:23:27 +11:00
gemset.nix	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00
unofficial-installation-nowarn.patch	vagrant: 2.2.0 -> 2.2.3	2019-02-12 00:23:46 +01:00
use-system-bundler-version.patch	vagrant: mark bundler as system plugin	2018-08-27 22:57:19 -07:00
vagrant-libvirt.json.in	vagrant: Install vagrant-libvirt as system plugin	2018-12-17 21:53:23 +11:00