Vladimír Čunát 14f5e9293c Re-revert "pythonPackages.flaky: 3.5.3 -> 3.6.1 (#68411)" ... This reverts commit a95a53aadc. i.e. the change is moved from the master branch to staging.		2019-09-16 19:26:03 +02:00
..
applications	Merge branch 'master' into staging-next	2019-09-16 19:24:52 +02:00
build-support	Merge branch 'staging-next' into staging	2019-09-12 22:49:43 +02:00
common-updater
data	Merge pull request #68738 from dtzWill/update/spleen-1.3.0	2019-09-16 10:47:09 -05:00
desktops	Merge branch 'master' into staging-next	2019-09-16 19:24:52 +02:00
development	Re-revert "pythonPackages.flaky: 3.5.3 -> 3.6.1 (#68411)"	2019-09-16 19:26:03 +02:00
games	Merge branch 'master' into staging-next	2019-09-16 19:24:52 +02:00
misc	tmuxPlugins.sysstat: init at 2017-12-12	2019-09-15 15:27:39 +02:00
os-specific	Merge branch 'master' into staging-next	2019-09-16 19:24:52 +02:00
servers	Merge branch 'master' into staging-next	2019-09-16 19:24:52 +02:00
shells	spaceship-prompt: 3.7.1 -> 3.11.2	2019-09-14 18:50:09 +09:00
stdenv
test
tools	Merge branch 'staging-next' into staging	2019-09-16 19:25:54 +02:00
top-level	Merge branch 'master' into staging-next	2019-09-16 19:24:52 +02:00