diff options
| author | Mark Schmitz <kramred@gmail.com> | 2018-06-07 14:23:53 +0100 |
|---|---|---|
| committer | Mark Schmitz <kramred@gmail.com> | 2018-06-07 14:23:53 +0100 |
| commit | 0deaedeeaef088040fb015f5be3e270e3bae508e (patch) | |
| tree | bbdab87adf45592a6a881f808e667ba5c21312a9 /.gitattributes | |
| parent | f6b3295d28352cbeb46dff04799cf8f4d39087bb (diff) | |
| parent | 17e45b2e9c33c736751e059276fadb480f98e621 (diff) | |
| download | Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.tar.gz Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.tar.zst Shaarli-0deaedeeaef088040fb015f5be3e270e3bae508e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 549777ef..6b6ffbd5 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -26,6 +26,7 @@ Dockerfile text | |||
| 26 | 26 | ||
| 27 | # Exclude from Git archives | 27 | # Exclude from Git archives |
| 28 | .editorconfig export-ignore | 28 | .editorconfig export-ignore |
| 29 | .dev export-ignore | ||
| 29 | .gitattributes export-ignore | 30 | .gitattributes export-ignore |
| 30 | .github export-ignore | 31 | .github export-ignore |
| 31 | .gitignore export-ignore | 32 | .gitignore export-ignore |