Merge branch 'master' into develop

da6fc175 · Taylor Otwell · 38aae749 · e11deb14 · da6fc175
Commit da6fc175 authored Feb 11, 2015 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.gitattributes .gitattributes +2 -2

No files found.
--- a/.gitattributes
+++ b/.gitattributes
 * text=auto
-public/* linguist-vendored=false
+*.css linguist-vendored=false
-resources/assets/* linguist-vendored=false
+*.less linguist-vendored=false