##// END OF EJS Templates
Merge branch 'master' into kernelmanager...
Merge branch 'master' into kernelmanager Conflicts: IPython/utils/traitlets.py

File last commit:

r2732:60cab731
r2752:5016a14f merge
Show More
__init__.py
2 lines | 78 B | text/x-python | PythonLexer
fperez
Reorganized the directory for ipython/ to have its own dir, which is a bit...
r0 # -*- coding: utf-8 -*-
Brian Granger
First take at cleaning up extensions.
r2732 """This directory is meant for IPython extensions."""