diff options
| author | Mark Otto <[email protected]> | 2012-09-17 16:43:18 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-17 16:43:18 -0700 |
| commit | 917b46a3430b33b7f2cde9ffe67a13aaa935e9a3 (patch) | |
| tree | 3183f0a04b908053d92830a904bc8f6a7db8f46b /less/bootstrap.less | |
| parent | c52368d3c5984b28e6a71e5e1240afdd788fc2e6 (diff) | |
| parent | 501a2d69e1df7fbed050fd4c2158172bd7b22fe3 (diff) | |
| download | bootstrap-917b46a3430b33b7f2cde9ffe67a13aaa935e9a3.tar.xz bootstrap-917b46a3430b33b7f2cde9ffe67a13aaa935e9a3.zip | |
resolve conflicts and remake
Diffstat (limited to 'less/bootstrap.less')
| -rw-r--r-- | less/bootstrap.less | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index aaa3d8a6f..0a1d2f375 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"; |