##// 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 / html / tests
casperjs
__init__.py Loading ...
launchnotebook.py Loading ...
test_files.py Loading ...
test_hist.sqlite Loading ...
test_notebookapp.py Loading ...
test_utils.py Loading ...