diff options
| author | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
| commit | 9dcae610e97c5422652d7212fda5985de1653d4c (patch) | |
| tree | 03f5f15fb5d3a1561f69ce97a1a9f651e816330c /package.json | |
| parent | 578a14e14aa7c6ad37f307d5d78e9a2afb0e7bfb (diff) | |
| parent | 5bd2d7ed7e5a2bae56de81bf550f2e4b1451ab25 (diff) | |
| download | bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.tar.xz bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
customize.html
examples/justified-nav/justified-nav.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package.json b/package.json index efcc5af0c..71f7aa5b4 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,10 @@ ] , "devDependencies": { "grunt": "~0.4.1" - , "grunt-contrib-connect": "~0.3.0" , "grunt-contrib-clean": "~0.5.0" + , "grunt-contrib-connect": "~0.3.0" , "grunt-contrib-concat": "~0.3.0" + , "grunt-contrib-copy": "~0.4.0" , "grunt-contrib-jshint": "~0.6.0" , "grunt-contrib-uglify": "~0.2.2" , "grunt-contrib-qunit": "~0.2.2" |