Frederik Rietdijk 257c6529b1 Revert "pythonPackages.simplejson: 3.16.0 -> 3.16.1" ... Mass-rebuild, should go to staging. This reverts commit af70ce2873.		2019-08-03 07:52:10 +02:00
..
applications	Merge staging-next into master, closes #65497	2019-08-03 07:42:50 +02:00
build-support	Merge master into staging-next	2019-08-01 09:42:54 +02:00
common-updater
data	Merge staging-next into master, closes #65497	2019-08-03 07:42:50 +02:00
desktops	Merge staging-next into master, closes #65497	2019-08-03 07:42:50 +02:00
development	Revert "pythonPackages.simplejson: 3.16.0 -> 3.16.1"	2019-08-03 07:52:10 +02:00
games	Merge master into staging-next	2019-08-02 23:27:18 +02:00
misc	Merge master into staging-next	2019-08-02 23:27:18 +02:00
os-specific	Merge master into staging-next	2019-08-01 09:42:54 +02:00
servers	Merge pull request #65784 from ciil/jira-update	2019-08-03 01:35:21 +02:00
shells	xonsh: 0.9.8 → 0.9.9	2019-07-31 23:08:31 +00:00
stdenv	Merge master into staging-next	2019-08-01 09:42:54 +02:00
test
tools	Merge master into staging-next	2019-08-02 23:27:18 +02:00
top-level	Merge master into staging-next	2019-08-02 23:27:18 +02:00