Frederik Rietdijk 9db2421d1f Merge master into staging-next		2018-11-29 08:12:56 +01:00
..
applications	Merge master into staging-next	2018-11-29 08:12:56 +01:00
build-support	Merge master into staging-next	2018-11-29 08:12:56 +01:00
common-updater	common-updater, firefox: fix updater for firefox	2018-11-16 23:04:54 +09:00
data	Merge pull request #50987 from c0bw3b/pkg/mailcap	2018-11-25 16:14:34 +01:00
desktops	Merge master into staging-next	2018-11-29 08:12:56 +01:00
development	Merge master into staging-next	2018-11-29 08:12:56 +01:00
games	boohu: 0.10 -> 0.11	2018-11-28 23:50:36 +03:00
misc	Merge master into staging-next	2018-11-29 08:12:56 +01:00
os-specific	Merge master into staging-next	2018-11-29 08:12:56 +01:00
servers	Merge master into staging-next	2018-11-29 08:12:56 +01:00
shells	nix-zsh-completions: 0.4.0 -> 0.4.1	2018-11-26 01:13:14 +01:00
stdenv	Merge branch 'master' into staging-next	2018-11-26 10:28:00 +01:00
test	Merge pull request #49290 from krebs/nix-writers	2018-11-27 07:17:03 +00:00
tools	Merge master into staging-next	2018-11-29 08:12:56 +01:00
top-level	Merge master into staging-next	2018-11-29 08:12:56 +01:00