diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2018-07-28 11:07:55 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2018-07-28 11:07:55 +0200 |
| commit | 83faedadff76c5bdca036f39f13943f63b27e164 (patch) | |
| tree | 6f44cede16ec6a60f10b9699e211e0818f06d2c8 /.gitattributes | |
| parent | 1d9eb22a3df85b67fe6652c0876cd7382c2fb525 (diff) | |
| parent | 658988f3aeba7a5a938783249ccf2765251e5597 (diff) | |
| download | Shaarli-83faedadff76c5bdca036f39f13943f63b27e164.tar.gz Shaarli-83faedadff76c5bdca036f39f13943f63b27e164.tar.zst Shaarli-83faedadff76c5bdca036f39f13943f63b27e164.zip | |
Merge tag 'v0.9.7' into stable
Release v0.9.7
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index a3a22a15..00070561 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -10,23 +10,33 @@ | |||
| 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 |
| 25 | *.mo binary | ||
| 19 | 26 | ||
| 20 | # Exclude from Git archives | 27 | # Exclude from Git archives |
| 28 | .editorconfig export-ignore | ||
| 21 | .gitattributes export-ignore | 29 | .gitattributes export-ignore |
| 30 | .github export-ignore | ||
| 22 | .gitignore export-ignore | 31 | .gitignore export-ignore |
| 23 | .travis.yml export-ignore | 32 | .travis.yml export-ignore |
| 24 | doc/**/*.json export-ignore | 33 | doc/**/*.json export-ignore |
| 25 | doc/**/*.md export-ignore | 34 | doc/**/*.md export-ignore |
| 26 | .docker/ export-ignore | 35 | .docker/ export-ignore |
| 27 | .dockerignore export-ignore | 36 | .dockerignore export-ignore |
| 28 | Dockerfile export-ignore | 37 | Dockerfile* export-ignore |
| 29 | Doxyfile export-ignore | 38 | Doxyfile export-ignore |
| 30 | Makefile export-ignore | 39 | Makefile export-ignore |
| 40 | mkdocs.yml export-ignore | ||
| 31 | phpunit.xml export-ignore | 41 | phpunit.xml export-ignore |
| 32 | tests/ export-ignore | 42 | tests/ export-ignore |