##// END OF EJS Templates
Merge branch 'issue-31'...
Merge branch 'issue-31' Conflicts: IPython/core/magic.py closes gh-31
Thomas Kluyver -
r3460:11e30b27 merge
Show More
Name Size Modified Last Commit Author
/ docs / source / interactive
figs
index.txt Loading ...
qtconsole.txt Loading ...
reference.txt Loading ...
shell.txt Loading ...
tutorial.txt Loading ...