Frederik Rietdijk daf3297cb4 Merge master into staging-next		2018-11-12 18:59:08 +01:00
..
applications	Merge master into staging-next	2018-11-12 18:59:08 +01:00
build-support	dockerTools.buildImageWithNixDb: simplifications and switch to closureInfo	2018-11-12 18:30:53 +01:00
common-updater
data	all-cabal-hashes: update to Hackage at 2018-11-12T01:24:24Z	2018-11-12 16:25:46 +01:00
desktops	deepin: remove obseleted dde-polkit-agent and dpa-ext-gnomekeyring	2018-11-10 12:37:06 -02:00
development	Merge master into staging-next	2018-11-12 18:59:08 +01:00
games	minecraft-server: 1.12.2 -> 1.13.2	2018-11-11 12:47:09 +01:00
misc	matcha: 2018-10-30 -> 2018-11-12	2018-11-12 09:24:29 -02:00
os-specific	Merge master into staging-next	2018-11-12 18:59:08 +01:00
servers	Merge pull request #50022 from Ekleog/opensmtpd-extras-6.4.0	2018-11-12 12:30:21 +01:00
shells	spaceship-prompt: correct homepage url	2018-11-11 10:53:51 +01:00
stdenv	Merge master into staging-next	2018-11-12 18:59:08 +01:00
test	Remove openftd	2018-10-21 21:52:20 +02:00
tools	Merge master into staging-next	2018-11-12 18:59:08 +01:00
top-level	Merge master into staging-next	2018-11-12 18:59:08 +01:00