##// END OF EJS Templates
Merge branch 'master' into interact-range-widgets...
Merge branch 'master' into interact-range-widgets Conflicts: IPython/html/static/style/ipython.min.css IPython/html/static/style/style.min.css IPython/html/static/widgets/js/widget_int.js

File last commit:

r10951:31998f30
r17589:157df08f merge
Show More
__init__.py
4 lines | 73 B | text/x-python | PythonLexer
try:
from path import *
except ImportError:
from ._path import *