##// 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
/ docs / source / config
editors.txt Loading ...
extensions.txt Loading ...
index.txt Loading ...
ipython.txt Loading ...
old.txt Loading ...
overview.txt Loading ...
plugins.txt Loading ...