##// END OF EJS Templates
Merge pull request #2 from ipython/master...
Merge pull request #2 from ipython/master pulling changes from current master

File last commit:

r7846:e288666b
r22831:f18b180e merge
Show More
.gitattributes
5 lines | 109 B | text/plain | TextLexer
IPython/.git_commit_info.ini export-subst
* text=auto
*.py diff=python
*.js diff=javascript
*.html diff=html