##// END OF EJS Templates
Merge pull request #12525 from ipython/revert-12488-auto-backport-of-pr-12207-on-7.x...
Merge pull request #12525 from ipython/revert-12488-auto-backport-of-pr-12207-on-7.x Revert "Backport PR #12207 on branch 7.x (Bump jedi to at least 0.16.0 and fix deprecated function usage)"

File last commit:

r7846:e288666b
r25994:6e65c1af 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