##// 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 / extensions
tests
__init__.py Loading ...
autoreload.py Loading ...
cythonmagic.py Loading ...
octavemagic.py Loading ...
parallelmagic.py Loading ...
rmagic.py Loading ...
storemagic.py Loading ...
sympyprinting.py Loading ...