diff options
| author | Mark Otto <[email protected]> | 2012-10-29 22:01:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-10-29 22:01:58 -0700 |
| commit | b5af762ef59e1fa97f4386f5feadb67aa5183fef (patch) | |
| tree | 3bcd0841e6938379e8c8ae7259ee16f27a49ea41 /less/bootstrap.less | |
| parent | 7426ced0fb288a9e86f18da1849ad74f652d219a (diff) | |
| parent | 68cfedb34af198f178128f8c9bc8ea164e44304a (diff) | |
| download | bootstrap-b5af762ef59e1fa97f4386f5feadb67aa5183fef.tar.xz bootstrap-b5af762ef59e1fa97f4386f5feadb67aa5183fef.zip | |
Merge branch '2.1.2-wip'v2.2.0
Conflicts:
js/bootstrap-dropdown.js
Diffstat (limited to 'less/bootstrap.less')
| -rw-r--r-- | less/bootstrap.less | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index aaa3d8a6f..e9d478d0a 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.1.1 + * Bootstrap v2.2.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -52,6 +52,7 @@ // Components: Misc @import "thumbnails.less"; +@import "media.less"; @import "labels-badges.less"; @import "progress-bars.less"; @import "accordion.less"; |