diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2017-03-09 20:10:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-09 20:10:14 +0100 |
| commit | 844021ab4c0d3dd6c26704648a736fa53244c914 (patch) | |
| tree | 088e86f48862099539057d6527381cc0ad617a27 /.gitattributes | |
| parent | 16a2ef6b5a28da9e3252d95c3217bb9b8c1e3ae4 (diff) | |
| parent | 07b57cfef9e23a033e92cf4a7c3fbe6686229c3b (diff) | |
| download | Shaarli-844021ab4c0d3dd6c26704648a736fa53244c914.tar.gz Shaarli-844021ab4c0d3dd6c26704648a736fa53244c914.tar.zst Shaarli-844021ab4c0d3dd6c26704648a736fa53244c914.zip | |
Merge pull request #797 from ArthurHoaro/hotfix/font-git
Prevent git from messing with font files
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 059fbb18..82f37602 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -10,10 +10,16 @@ | |||
| 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 | ||