##// END OF EJS Templates
Merge branch 'master' of https://github.com/avandever/ipython Conflicts: IPython/core/completerlib.py
Andrew Vandever -
r8542:f4417849 merge
Show More
Name Size Modified Last Commit Author
/ IPython / lib / tests
__init__.py Loading ...
test_backgroundjobs.py Loading ...
test_deepreload.py Loading ...
test_imports.py Loading ...
test_irunner.py Loading ...
test_irunner_pylab_magic.py Loading ...
test_kernel.py Loading ...
test_latextools.py Loading ...
test_pretty.py Loading ...
test_security.py Loading ...