##// END OF EJS Templates
Merge remote-tracking branch 'upstream/master' into add-more-windows-ci
Merge remote-tracking branch 'upstream/master' into add-more-windows-ci

File last commit:

r7846:e288666b
r25228:edf31214 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