Merge branch '3.1' into 3.2

This commit is contained in:
Daniel Hensby 2016-09-14 11:39:00 +01:00
commit 90a01870ea
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

3
.gitattributes vendored
View File

@ -1 +1,4 @@
docs/ export-ignore
# Line endings
sake text eol=lf