diff options
| author | Mark Otto <[email protected]> | 2013-02-05 19:53:44 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-05 19:53:44 -0800 |
| commit | 43da258bd9e67e0aaa850bd92c95937f7d586796 (patch) | |
| tree | 21dd1a45f52eba75b11a0dd6770d9d3aed28e685 /package.json | |
| parent | e4a74607b02f81e8007ac9903da1e6eddd8a5692 (diff) | |
| parent | c97d304c0ca0c3b11f2c550590b54a75b41471fb (diff) | |
| download | bootstrap-43da258bd9e67e0aaa850bd92c95937f7d586796.tar.xz bootstrap-43da258bd9e67e0aaa850bd92c95937f7d586796.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index 40a5f5a58..2941c2963 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ , "devDependencies": { "uglify-js": "1.3.4" , "jshint": "0.9.1" - , "recess": "1.0.3" + , "recess": "1.1.6" , "connect": "2.1.3" , "hogan.js": "2.0.0" } |