Merge branch 'master' into dev_1.2
[VOID.git] / .gitattributes
toadicus Git will no longer mangle pngs.
Andy Wilkinson EOL Normalization