##// END OF EJS Templates
Merge commit '37dadeb' (most of PR #4391)...
Merge commit '37dadeb' (most of PR #4391) Conflicts: IPython/testing/iptestcontroller.py
Thomas Kluyver -
r13312:c1912cf4 merge
Show More
Name Size Modified Last Commit Author
/ IPython / parallel
apps
client
controller
engine
scripts
tests
__init__.py Loading ...
error.py Loading ...
factory.py Loading ...
util.py Loading ...