aboutsummaryrefslogtreecommitdiff
path: root/less/bootstrap.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-17 18:15:44 -0700
committerMark Otto <[email protected]>2012-09-17 18:15:44 -0700
commit26ca131a950398e0c3c447da01658939feb40df1 (patch)
tree027528656848e35d5764194ba6e083a75cf8244f /less/bootstrap.less
parentcaa79ed594daae704793a08e94a6e2d9da32eaf1 (diff)
parent143fef9f95daca088c1a910fccd07f2b520d8b0b (diff)
downloadbootstrap-26ca131a950398e0c3c447da01658939feb40df1.tar.xz
bootstrap-26ca131a950398e0c3c447da01658939feb40df1.zip
Merge branch 'wpbrains-media-component' into 2.1.2-wip
Diffstat (limited to 'less/bootstrap.less')
-rw-r--r--less/bootstrap.less1
1 files changed, 1 insertions, 0 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less
index 3055c5cc4..a09708173 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -52,6 +52,7 @@
// Components: Misc
@import "thumbnails.less";
+@import "media.less";
@import "labels-badges.less";
@import "progress-bars.less";
@import "accordion.less";