Merge 1aac15b into d94a02a

accompli · May 4, 2016 · dac8bb1 · dac8bb1
2 parents d94a02a + 1aac15b
commit dac8bb1
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,11 +1,21 @@
 # Force Unix line-endings
-* text eol=lf
-*.png binary
+.gitattributes eol=lf
+.gitignore eol=lf
+*.css eol=lf
+*.html eol=lf
+*.json eol=lf
+*.lock eol=lf
+*.md eol=lf
+*.phar eol=lf
+*.php eol=lf
+*.xml eol=lf
+*.yml eol=lf
 
 # Remove all test and documentation files from releases with 'export-ignore'.
 /docs               export-ignore
 /tests              export-ignore
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
 /.travis.yml        export-ignore
+/.styleci.yml       export-ignore
 /phpunit.xml        export-ignore