##// 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
Gordon Ball -
r17589:157df08f merge
Show More
Name Size Modified Last Commit Author
/ IPython / nbformat / v1
tests
__init__.py Loading ...
convert.py Loading ...
nbbase.py Loading ...
nbjson.py Loading ...
rwbase.py Loading ...