2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'master' into pr/11412

Conflicts:
	dist/js/bootstrap.min.js
This commit is contained in:
Mark Otto
2013-12-01 20:27:30 -08:00
68 changed files with 1029 additions and 997 deletions
+1 -3
View File
@@ -1,9 +1,7 @@
/*!
* Bootstrap v3.0.2 by @fat and @mdo
* Bootstrap v3.0.3 (http://getbootstrap.com)
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
.btn-default,
+1 -3
View File
File diff suppressed because one or more lines are too long
+323 -363
View File
File diff suppressed because it is too large Load Diff
+2 -4
View File
File diff suppressed because one or more lines are too long