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

This commit is contained in:
Mark Otto 2014-03-07 00:28:29 -08:00
commit fe0d5959d2
4 changed files with 130 additions and 129 deletions

1
.gitattributes vendored
View File

@ -5,4 +5,5 @@
*.json text eol=lf
*.less text eol=lf
*.md text eol=lf
*.svg text eol=lf
*.yml text eol=lf