Merge remote-tracking branch 'origin/master'
[idea/community.git] / .gitattributes
1 *.iml crlf