##// END OF EJS Templates
Merge branch 'master' into kernelmanager...
Merge branch 'master' into kernelmanager Conflicts: IPython/utils/traitlets.py
Brian Granger -
r2752:5016a14f merge
Show More
Name Size Modified Last Commit Author
/ IPython / deathrow / oldfrontend / tests
__init__.py Loading ...
test_asyncfrontendbase.py Loading ...
test_frontendbase.py Loading ...
test_linefrontend.py Loading ...
test_prefilterfrontend.py Loading ...
test_process.py Loading ...