John Ericson 4ccb74011f Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging ... There was one conflict in the NixOS manual; I checked that it still built after resolving it.		2019-04-01 00:40:03 -04:00
..
default.nix	Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging	2019-04-01 00:40:03 -04:00