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

r14009:6f019b30
r17589:157df08f merge
Show More
__main__.py
3 lines | 105 B | text/x-python | PythonLexer
if __name__ == '__main__':
from IPython.html import notebookapp as app
app.launch_new_instance()