Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2015-02-11 12:52:56 -06:00
commit da6fc175fb
1 changed files with 2 additions and 2 deletions

4
.gitattributes vendored
View File

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