##// 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 / tests / widgets
widget.js Loading ...
widget_bool.js Loading ...
widget_button.js Loading ...
widget_container.js Loading ...
widget_float.js Loading ...
widget_image.js Loading ...
widget_int.js Loading ...
widget_selection.js Loading ...
widget_selectioncontainer.js Loading ...
widget_string.js Loading ...