##// END OF EJS Templates
Merge branch 'htmlnotebook' of github.com:ipython/ipython into htmlnotebook...
Merge branch 'htmlnotebook' of github.com:ipython/ipython into htmlnotebook Conflicts: setupbase.py
Brian E. Granger -
r4485:d77eb2c8 merge
Show More
Name Size Modified Last Commit Author
/ IPython / parallel
apps
client
controller
engine
scripts
tests
__init__.py Loading ...
error.py Loading ...
factory.py Loading ...
util.py Loading ...