Merge branch 'master' into develop

d75ed338 · Taylor Otwell · da6fc175 · e3630a53 · d75ed338
Commit d75ed338 authored Feb 12, 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
-*.css linguist-vendored=false
+*.css linguist-vendored
-*.less linguist-vendored=false
+*.less linguist-vendored