X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitattributes;h=a3a22a1561fcd2e8731ec26673c4ab11ce22bfb1;hb=35927142d7440f6a7c360e53b2beb3a6834835f0;hp=e616be284b34b6e82d96fac112f4da197480ce8d;hpb=c6a7972de51a15d94ccb69dfb008d5560820452c;p=github%2Fshaarli%2FShaarli.git

diff --git a/.gitattributes b/.gitattributes
index e616be28..a3a22a15 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,11 @@
 .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
+.dockerignore   export-ignore
+Dockerfile      export-ignore
 Doxyfile        export-ignore
 Makefile        export-ignore
 phpunit.xml     export-ignore