mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

Merge branch '3.0.0-wip' into bs3_theme

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-17 17:31:58 -07:00
parent 2af9cf10ce e29c23afab
commit ba20e512ce
116 changed files with 9929 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/bootstrap.less
Vendored
-1
View File
@@ -54,7 +54,6 @@
@import "labels.less";
@import "badges.less";
@import "progress-bars.less";
@import "accordion.less";
@import "carousel.less";
@import "jumbotron.less";