##// END OF EJS Templates
Merging from upstream (with a few local cleanups when resolving conflicts).
Merging from upstream (with a few local cleanups when resolving conflicts).
Fernando Perez -
r1866:bca2d8bf merge
Show More
Name Size Modified Last Commit Author
/ IPython / tests
__init__.py Loading ...
obj_del.py Loading ...
tclass.py Loading ...
test_genutils.py Loading ...
test_iplib.py Loading ...
test_magic.py Loading ...