##// 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 / config / default
__init__.py Loading ...
ipcluster_config.py Loading ...
ipcontroller_config.py Loading ...
ipengine_config.py Loading ...
ipython_config.py Loading ...