Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2015-02-12 13:16:00 -06:00
commit d75ed33861
1 changed files with 2 additions and 2 deletions

4
.gitattributes vendored
View File

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