aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitattributes
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2016-08-12 22:09:07 +0200
committerGitHub <noreply@github.com>2016-08-12 22:09:07 +0200
commita34d6da642acda37b04e4c5d732d42a84df65068 (patch)
treef5d8503e4b3245b854cc181de273318e2ae97de1 /.gitattributes
parente0dd77c37e433d71462f87c8e8c75196aa958940 (diff)
parentb039a061ebc55f2b62ec3fbead3e4a34666a0aaa (diff)
downloadShaarli-a34d6da642acda37b04e4c5d732d42a84df65068.tar.gz
Shaarli-a34d6da642acda37b04e4c5d732d42a84df65068.tar.zst
Shaarli-a34d6da642acda37b04e4c5d732d42a84df65068.zip
Merge pull request #634 from virtualtam/composer/gitattributes
Fix: keep composer.json in release archives
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index aaf6a39e..d753b1db 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,7 +21,6 @@ Dockerfile text
21.gitattributes export-ignore 21.gitattributes export-ignore
22.gitignore export-ignore 22.gitignore export-ignore
23.travis.yml export-ignore 23.travis.yml export-ignore
24composer.json export-ignore
25doc/**/*.json export-ignore 24doc/**/*.json export-ignore
26doc/**/*.md export-ignore 25doc/**/*.md export-ignore
27docker/ export-ignore 26docker/ export-ignore