##// 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 / tests
__init__.py Loading ...
clienttest.py Loading ...
test_asyncresult.py Loading ...
test_client.py Loading ...
test_db.py Loading ...
test_dependency.py Loading ...
test_launcher.py Loading ...
test_lbview.py Loading ...
test_magics.py Loading ...
test_mongodb.py Loading ...
test_view.py Loading ...