Merge branch '2.0'

This commit is contained in:
terrafrost 2016-01-12 09:38:29 -06:00
commit 93c10e7fb3

8
.gitattributes vendored
View File

@ -1 +1,9 @@
* text=auto * text=auto
/build/ export-ignore
/tests/ export-ignore
/travis/ export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/CHANGELOG.md export-ignore
/phpunit.xml.dist export-ignore