Merge branch 'master' into 6.0

This commit is contained in:
Marcus Bointon 2016-10-17 19:00:36 +02:00
commit 83f306634d
No known key found for this signature in database
GPG Key ID: DE31CD6EB646AA24
1 changed files with 0 additions and 1 deletions

1
.gitattributes vendored
View File

@ -1,7 +1,6 @@
* text=auto
/docs export-ignore
/examples export-ignore
/test export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore