Eelco Dolstra ebc4dae517 Merge remote-tracking branch 'origin/master' into flakes		2019-08-29 16:11:38 +02:00
..
flakes	Rename 'epoch' -> 'edition'	2019-07-11 13:54:53 +02:00
manual	Merge pull request #3048 from toonn/nix-env_doc	2019-08-29 15:22:01 +02:00