Frederik Rietdijk e41154d1ab Merge master into staging-next		2018-11-24 10:43:33 +01:00
..
applications	Merge master into staging-next	2018-11-24 10:43:33 +01:00
build-support	Merge master into staging-next	2018-11-24 10:43:33 +01:00
common-updater	common-updater, firefox: fix updater for firefox	2018-11-16 23:04:54 +09:00
data	inter-ui: 2.5 -> 3.0	2018-11-23 15:41:22 +01:00
desktops	Merge staging-next into staging	2018-11-20 11:51:11 +01:00
development	Merge master into staging-next	2018-11-24 10:43:33 +01:00
games	minetest: 0.4.17 -> 0.4.17.1	2018-11-23 17:48:14 +01:00
misc	Merge master into staging-next	2018-11-24 10:43:33 +01:00
os-specific	Merge master into staging-next	2018-11-24 10:43:33 +01:00
servers	Merge master into staging-next	2018-11-24 10:43:33 +01:00
shells	powershell: 6.1.0 -> 6.1.1	2018-11-24 03:56:35 +01:00
stdenv	Merge master into staging-next	2018-11-22 09:57:08 +01:00
test	pkgs/test/nixos-functions: use dummy versioning	2018-11-19 19:26:52 +00:00
tools	Merge master into staging-next	2018-11-24 10:43:33 +01:00
top-level	Merge master into staging-next	2018-11-24 10:43:33 +01:00