##// 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 / nbconvert / filters
tests
__init__.py Loading ...
ansi.py Loading ...
citation.py Loading ...
datatypefilter.py Loading ...
highlight.py Loading ...
latex.py Loading ...
markdown.py Loading ...
marked.js Loading ...
strings.py Loading ...