Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
activation	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
boot	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
etc	environment.etc: add user/group option	2017-07-29 23:56:46 +01:00