##// END OF EJS Templates
Merge remote-tracking branch 'public-upstream/master' into links-rebase...
Merge remote-tracking branch 'public-upstream/master' into links-rebase Conflicts: examples/Interactive Widgets/Widget Events.ipynb
Jason Grout -
r19202:bab26ab3 merge
Show More
Name Size Modified Last Commit Author
/ IPython / parallel / apps
__init__.py Loading ...
baseapp.py Loading ...
ipclusterapp.py Loading ...
ipcontrollerapp.py Loading ...
ipengineapp.py Loading ...
iploggerapp.py Loading ...
launcher.py Loading ...
logwatcher.py Loading ...
win32support.py Loading ...
winhpcjob.py Loading ...