##// END OF EJS Templates
Merge branch 'master' into fix-rm-harcoded-colors
Merge branch 'master' into fix-rm-harcoded-colors

File last commit:

r7846:e288666b
r25902:21ac5592 merge
Show More
.gitattributes
5 lines | 109 B | text/plain | TextLexer
Fernando Perez
Add support for commit information in auto-generated archives....
r3199 IPython/.git_commit_info.ini export-subst
Darren Dale
update .gitattributes to normalize line endings
r3217 * text=auto
Bradley M. Froehle
Tell git about certain file extensions (.py, .js, .html) for use in word-diffs.
r7846 *.py diff=python
*.js diff=javascript
*.html diff=html