##// 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 / html / templates
404.html Loading ...
error.html Loading ...
login.html Loading ...
logout.html Loading ...
notebook.html Loading ...
page.html Loading ...
tree.html Loading ...