X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitattributes;h=d753b1db076ab9fce664b20d15c361a1b5ecefe6;hb=8868f3ca461011a8fb6dd9f90b60ed697ab52fc5;hp=e616be284b34b6e82d96fac112f4da197480ce8d;hpb=0baf7842fc0cf4cbd5ca2b8c5ae6dc7a59c07700;p=github%2Fshaarli%2FShaarli.git

diff --git a/.gitattributes b/.gitattributes
index e616be28..d753b1db 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,11 +2,13 @@
 *       text=auto eol=lf
 
 # Ensure sources are processed
+*.conf  text
 *.css   text
 *.html  text diff=html
 *.js    text
 *.md    text
 *.php   text diff=php
+Dockerfile      text
 
 # Do not alter images nor minified scripts
 *.ico           binary
@@ -19,9 +21,9 @@
 .gitattributes  export-ignore
 .gitignore      export-ignore
 .travis.yml     export-ignore
-composer.json   export-ignore
 doc/**/*.json   export-ignore
 doc/**/*.md     export-ignore
+docker/         export-ignore
 Doxyfile        export-ignore
 Makefile        export-ignore
 phpunit.xml     export-ignore