diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 19:23:32 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-05-07 19:23:32 +0200 |
commit | fcf141926da98a4a656a785df991858819961319 (patch) | |
tree | 049c1ff6b770e759ca7a96b30e6476b9f18cbfa3 /.gitattributes | |
parent | 8868f3ca461011a8fb6dd9f90b60ed697ab52fc5 (diff) | |
parent | 54c8e8d2998c5ab5ffd08ae8f1fa11276773c16c (diff) | |
download | Shaarli-fcf141926da98a4a656a785df991858819961319.tar.gz Shaarli-fcf141926da98a4a656a785df991858819961319.tar.zst Shaarli-fcf141926da98a4a656a785df991858819961319.zip |
Merge tag 'v0.9.0' into latest
Release v0.9.0
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index d753b1db..82f37602 100644 --- a/.gitattributes +++ b/.gitattributes | |||
@@ -10,15 +10,22 @@ | |||
10 | *.php text diff=php | 10 | *.php text diff=php |
11 | Dockerfile text | 11 | Dockerfile text |
12 | 12 | ||
13 | # Do not alter images nor minified scripts | 13 | # Do not alter images nor minified scripts nor fonts |
14 | *.ico binary | 14 | *.ico binary |
15 | *.jpg binary | 15 | *.jpg binary |
16 | *.png binary | 16 | *.png binary |
17 | *.svg binary | ||
18 | *.otf binary | ||
19 | *.eot binary | ||
20 | *.woff binary | ||
21 | *.woff2 binary | ||
22 | *.ttf binary | ||
17 | *.min.css binary | 23 | *.min.css binary |
18 | *.min.js binary | 24 | *.min.js binary |
19 | 25 | ||
20 | # Exclude from Git archives | 26 | # Exclude from Git archives |
21 | .gitattributes export-ignore | 27 | .gitattributes export-ignore |
28 | .github export-ignore | ||
22 | .gitignore export-ignore | 29 | .gitignore export-ignore |
23 | .travis.yml export-ignore | 30 | .travis.yml export-ignore |
24 | doc/**/*.json export-ignore | 31 | doc/**/*.json export-ignore |