diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-03-11 16:20:53 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-03-11 16:20:53 +0100 |
| commit | c03d4cfb8bf2e2d4f70359fcbccaca57d0fc66cf (patch) | |
| tree | 40d11e3ca717f9ff6480f3b56bb947ee1a863a4f | |
| parent | 4e2ba8c888d650f566d43f58a525566c97f55a35 (diff) | |
| parent | 5571c0c3814e98b04930b11c0edebbdd0024f6b1 (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 3fd62ba29..5b57eba56 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,6 +17,8 @@ makesrcdist export-ignore eol=lf .gitattributes export-ignore .gitignore export-ignore +.gitlab-ci.yml export-ignore +.travis.yml export-ignore # fluid files (eol=lf or text?) |