Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell
2015-02-11 12:51:01 -06:00

2
.gitattributes vendored
View File

@@ -1 +1,3 @@
* text=auto
public/* linguist-vendored=false
resources/assets/* linguist-vendored=false