mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 08:39:56 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-12154

Browse Source 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2014-02-08 16:52:22 -08:00
parent 4787a69efb 7f88009394
commit e9199718d6
160 changed files with 13092 additions and 10848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/css/bootstrap-theme.css vendored
View File

@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.0.3 (http://getbootstrap.com)
* Bootstrap v3.1.0 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

2
dist/css/bootstrap-theme.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap-theme.min.css vendored
View File

@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.0.3 (http://getbootstrap.com)
* Bootstrap v3.1.0 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

753
dist/css/bootstrap.css vendored
View File

File diff suppressed because it is too large Load Diff

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long