Frederik Rietdijk 6ad79678d4 Merge remote-tracking branch 'upstream/master' into HEAD		2017-11-23 16:38:31 +01:00
..
applications	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
build-support	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
common-updater
data	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
desktops	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
development	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
games	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
misc	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
os-specific	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
servers	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
shells	nix-bash-completions: 0.4 -> 0.5	2017-11-21 14:05:03 +01:00
stdenv	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00
top-level	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-23 16:38:31 +01:00