##// END OF EJS Templates
Merge branch 'issue-31'...
Merge branch 'issue-31' Conflicts: IPython/core/magic.py closes gh-31
Thomas Kluyver -
r3460:11e30b27 merge
Show More
Name Size Modified Last Commit Author
/ IPython / utils / tests
__init__.py Loading ...
test_imports.py Loading ...
test_io.py Loading ...
test_jsonutil.py Loading ...
test_notification.py Loading ...
test_path.py Loading ...
test_process.py Loading ...
test_traitlets.py Loading ...
test_wildcard.py Loading ...