##// 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 / config
editors.txt Loading ...
extensions.txt Loading ...
index.txt Loading ...
ipython.txt Loading ...
old.txt Loading ...
overview.txt Loading ...
plugins.txt Loading ...