Merge branch 'master' of github.com:twbs/bootstrap

2014-03-07 00:28:29 -08:00 · 2014-03-07 00:28:29 -08:00 · fe0d5959d2
parent 5bd2799978 24ec60e6e5
commit fe0d5959d2
4 changed files with 130 additions and 129 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -5,4 +5,5 @@
 *.json  text eol=lf
 *.less  text eol=lf
 *.md    text eol=lf
+*.svg   text eol=lf
 *.yml   text eol=lf