Merge remote-tracking branch 'origin/master'

This commit is contained in:
ManoloFLTK 2019-03-11 16:20:53 +01:00
commit c03d4cfb8b

2
.gitattributes vendored
View File

@ -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?)