Merge remote-tracking branch 'origin/master' into mikhail.golubev/json-preview
[idea/community.git] / .gitattributes
1 # keep this this the first line in the file
2 *       text=auto