mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Merge branch 'master' into pr/12490

Browse Source 
Conflicts:
	less/list-group.less
This commit is contained in:
Mark Otto
2014-03-06 21:32:52 -08:00
parent d1a7271ea1 fab10b643e
commit c8614c0f15
170 changed files with 13561 additions and 6507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap-rtl.css
Vendored
+7230
View File
File diff suppressed because it is too large Load Diff
dist/css/bootstrap-rtl.min.css
Vendored
+7
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap-theme.css
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.1.0 (http://getbootstrap.com)
* Bootstrap v3.1.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
dist/css/bootstrap-theme.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap-theme.min.css
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v3.1.0 (http://getbootstrap.com)
* Bootstrap v3.1.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
dist/css/bootstrap.css
Vendored
+2301 -2273
View File
File diff suppressed because it is too large Load Diff
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long