aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitattributes
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2018-06-20 16:59:29 +0200
committerGitHub <noreply@github.com>2018-06-20 16:59:29 +0200
commit6325e74caa464818000066b5112cfd293e168e50 (patch)
tree8c452980d8c7d6f98aa61e2d814377a1efc70fb3 /.gitattributes
parent26b0b2022870a540c1a6d54e949c4bdc1486daed (diff)
parentc064d3179e0396983bdf8dee545388e4142ed842 (diff)
downloadShaarli-6325e74caa464818000066b5112cfd293e168e50.tar.gz
Shaarli-6325e74caa464818000066b5112cfd293e168e50.tar.zst
Shaarli-6325e74caa464818000066b5112cfd293e168e50.zip
Merge pull request #1158 from virtualtam/master-dockerfile
Master: Build the Docker images from the local sources
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 6b6ffbd5..9d22f11b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -33,7 +33,9 @@ Dockerfile text
33.travis.yml export-ignore 33.travis.yml export-ignore
34doc/**/*.json export-ignore 34doc/**/*.json export-ignore
35doc/**/*.md export-ignore 35doc/**/*.md export-ignore
36docker/ export-ignore 36.docker/ export-ignore
37.dockerignore export-ignore
38Dockerfile* export-ignore
37Doxyfile export-ignore 39Doxyfile export-ignore
38Makefile export-ignore 40Makefile export-ignore
39node_modules/ export-ignore 41node_modules/ export-ignore