Frederik Rietdijk 63c6875f26 Merge master into staging-next		2018-11-18 10:32:12 +01:00
..
applications	Merge master into staging-next	2018-11-18 10:32:12 +01:00
build-support	defaultCrateOverrides: foundationdb native dependencies	2018-11-17 19:28:48 -06:00
common-updater	common-updater, firefox: fix updater for firefox	2018-11-16 23:04:54 +09:00
data	Merge pull request #47690 from romildo/fix.icon-cache	2018-11-12 17:24:53 -06:00
desktops	Merge master into staging-next	2018-11-18 10:32:12 +01:00
development	Merge master into staging-next	2018-11-18 10:32:12 +01:00
games	Merge master into staging-next	2018-11-18 10:32:12 +01:00
misc	Merge master into staging-next	2018-11-18 10:32:12 +01:00
os-specific	Merge master into staging-next	2018-11-18 10:32:12 +01:00
servers	Merge master into staging-next	2018-11-18 10:32:12 +01:00
shells	dash: add licenses	2018-11-15 00:13:52 +01:00
stdenv	Merge master into staging-next	2018-11-12 18:59:08 +01:00
test	pkgs/test/nixos-functions: Add inline doc	2018-11-13 10:47:17 +01:00
tools	Merge master into staging-next	2018-11-18 10:32:12 +01:00
top-level	Merge master into staging-next	2018-11-18 10:32:12 +01:00