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
..
netboot-base.nix	set initialHashedPassword in installation-device.nix	2018-08-07 14:45:50 +02:00
netboot-minimal.nix
netboot.nix	Revert "Revert "Merge master into staging-next""	2020-02-05 19:41:25 +01:00