##// 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:

r11033:fa36e98f
r17589:157df08f merge
Show More
test_hist.sqlite
0 lines | 7.0 KiB | application/octet-stream | TextLexer
/ IPython / html / tests / test_hist.sqlite
Binary file (application/octet-stream)