Docker: move Dockerfiles to the main repository

[github/shaarli/Shaarli.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index e616be284b34b6e82d96fac112f4da197480ce8d..aaf6a39e94aaa8c5e3faa59ac8b0d54bd17a372e 100644 (file)
--- 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
@@ -22,6 +24,7 @@
 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