Robert Schütz 178b84c10d python.pkgs.ipython: allow prompt_toolkit 2.0 ... This applies the appropriate upstream patch: 8e256bd373		2018-07-26 12:43:15 +02:00
..
applications	parity-ui: fix after merge	2018-07-22 11:51:50 +02:00
build-support	Merge master into staging	2018-07-22 11:14:41 +02:00
common-updater
data	Merge staging-next into master	2018-07-22 11:04:28 +02:00
desktops	Merge master into staging	2018-07-22 11:14:41 +02:00
development	python.pkgs.ipython: allow prompt_toolkit 2.0	2018-07-26 12:43:15 +02:00
games	Merge staging-next into master	2018-07-22 11:04:28 +02:00
misc	Merge master into staging-next	2018-07-21 19:43:53 +02:00
os-specific	Merge master into staging	2018-07-22 11:14:41 +02:00
servers	Merge master into staging	2018-07-22 11:14:41 +02:00
shells	Merge pull request #43912 from r-ryantm/auto-update/powershell	2018-07-22 08:44:38 +02:00
stdenv	Merge master into staging	2018-07-22 11:14:41 +02:00
test	tests: add some cross tests	2018-07-21 17:00:05 -04:00
tools	Merge master into staging	2018-07-22 11:14:41 +02:00
top-level	pipenv: 2018.5.18 -> 2018.7.1	2018-07-22 16:52:33 +02:00