updated changelog with 1.8.2-4 content, added .gitattributes

This commit is contained in:
Gerard Lynch
2015-02-23 22:20:33 +00:00
parent 65e68cdff9
commit 5b1d51c2bf
2 changed files with 18 additions and 0 deletions

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
CHANGELOG.md merge=union