Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2015-02-11 12:51:01 -06:00
commit 38aae749a3
1 changed files with 2 additions and 0 deletions

2
.gitattributes vendored
View File

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