diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 19:17:33 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 19:17:33 +0200 |
commit | 01e942d44c7194607649817216aeb5d65c6acad6 (patch) | |
tree | 15777aa1005251f119e6dd680291147117766b5b /.gitattributes | |
parent | bc22c9a0acb095970e9494cbe8954f0612e05dc0 (diff) | |
parent | 8868f3ca461011a8fb6dd9f90b60ed697ab52fc5 (diff) | |
download | Shaarli-01e942d44c7194607649817216aeb5d65c6acad6.tar.gz Shaarli-01e942d44c7194607649817216aeb5d65c6acad6.tar.zst Shaarli-01e942d44c7194607649817216aeb5d65c6acad6.zip |
Merge tag 'v0.8.4' into stable
Release v0.8.4
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 1 |
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 |
24 | composer.json export-ignore | ||
25 | doc/**/*.json export-ignore | 24 | doc/**/*.json export-ignore |
26 | doc/**/*.md export-ignore | 25 | doc/**/*.md export-ignore |
27 | docker/ export-ignore | 26 | docker/ export-ignore |