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
..
applications	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
build-support	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
common-updater
data	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
desktops	gnome3: add GNOME updatables to the attrset	2018-03-08 02:05:58 +01:00
development	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
games	Merge pull request #36649 from pbogdan/pingus-fix-build	2018-03-09 17:42:18 +00:00
misc	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
os-specific	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
servers	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
shells
stdenv	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
test
tools	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
top-level	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00