Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c03d4cfb8b
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -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?)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user