mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
Merge branch 'master' of github.com:twbs/bootstrap
This commit is contained in:
Mark Otto
commit
9da127a8e5
@ -33,7 +33,7 @@
|
|||||||
"btoa": "~1.1.2",
|
"btoa": "~1.1.2",
|
||||||
"glob": "~4.0.2",
|
"glob": "~4.0.2",
|
||||||
"grunt": "~0.4.5",
|
"grunt": "~0.4.5",
|
||||||
"grunt-autoprefixer": "~0.7.5",
|
"grunt-autoprefixer": "~0.7.6",
|
||||||
"grunt-banner": "~0.2.3",
|
"grunt-banner": "~0.2.3",
|
||||||
"grunt-contrib-clean": "~0.5.0",
|
"grunt-contrib-clean": "~0.5.0",
|
||||||
"grunt-contrib-concat": "~0.4.0",
|
"grunt-contrib-concat": "~0.4.0",
|
||||||
@ -43,7 +43,7 @@
|
|||||||
"grunt-contrib-cssmin": "~0.10.0",
|
"grunt-contrib-cssmin": "~0.10.0",
|
||||||
"grunt-contrib-jade": "~0.12.0",
|
"grunt-contrib-jade": "~0.12.0",
|
||||||
"grunt-contrib-jshint": "~0.10.0",
|
"grunt-contrib-jshint": "~0.10.0",
|
||||||
"grunt-contrib-less": "~0.11.2",
|
"grunt-contrib-less": "~0.11.3",
|
||||||
"grunt-contrib-qunit": "~0.5.1",
|
"grunt-contrib-qunit": "~0.5.1",
|
||||||
"grunt-contrib-uglify": "~0.5.0",
|
"grunt-contrib-uglify": "~0.5.0",
|
||||||
"grunt-contrib-watch": "~0.6.1",
|
"grunt-contrib-watch": "~0.6.1",
|
||||||
@ -54,9 +54,9 @@
|
|||||||
"grunt-jscs-checker": "~0.5.1",
|
"grunt-jscs-checker": "~0.5.1",
|
||||||
"grunt-saucelabs": "~8.0.2",
|
"grunt-saucelabs": "~8.0.2",
|
||||||
"grunt-sed": "~0.1.1",
|
"grunt-sed": "~0.1.1",
|
||||||
"load-grunt-tasks": "~0.5.0",
|
"load-grunt-tasks": "~0.6.0",
|
||||||
"markdown": "~0.5.0",
|
"markdown": "~0.5.0",
|
||||||
"npm-shrinkwrap": "~3.1.4",
|
"npm-shrinkwrap": "~3.1.6",
|
||||||
"time-grunt": "~0.3.2"
|
"time-grunt": "~0.3.2"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|||||||
70
test-infra/npm-shrinkwrap.json
generated
70
test-infra/npm-shrinkwrap.json
generated
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "bootstrap",
|
"name": "bootstrap",
|
||||||
"version": "3.1.1",
|
"version": "3.1.1",
|
||||||
"npm-shrinkwrap-version": "3.1.4",
|
"npm-shrinkwrap-version": "3.1.6",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"btoa": {
|
"btoa": {
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
@ -222,16 +222,16 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"grunt-autoprefixer": {
|
"grunt-autoprefixer": {
|
||||||
"version": "0.7.5",
|
"version": "0.7.6",
|
||||||
"resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-0.7.5.tgz",
|
"resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-0.7.6.tgz",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"autoprefixer": {
|
"autoprefixer": {
|
||||||
"version": "1.2.0",
|
"version": "1.3.1",
|
||||||
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-1.3.1.tgz",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"caniuse-db": {
|
"caniuse-db": {
|
||||||
"version": "1.0.20140618",
|
"version": "1.0.20140619",
|
||||||
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.20140618.tgz"
|
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.20140619.tgz"
|
||||||
},
|
},
|
||||||
"fs-extra": {
|
"fs-extra": {
|
||||||
"version": "0.9.1",
|
"version": "0.9.1",
|
||||||
@ -367,13 +367,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"raw-body": {
|
"raw-body": {
|
||||||
"version": "1.1.6",
|
"version": "1.1.6",
|
||||||
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.6.tgz",
|
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.6.tgz"
|
||||||
"dependencies": {
|
|
||||||
"bytes": {
|
|
||||||
"version": "1.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -1120,8 +1114,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"grunt-contrib-less": {
|
"grunt-contrib-less": {
|
||||||
"version": "0.11.2",
|
"version": "0.11.3",
|
||||||
"resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.2.tgz",
|
"resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.3.tgz",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"async": {
|
"async": {
|
||||||
"version": "0.2.10",
|
"version": "0.2.10",
|
||||||
@ -1146,8 +1140,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"less": {
|
"less": {
|
||||||
"version": "1.7.0",
|
"version": "1.7.3",
|
||||||
"resolved": "https://registry.npmjs.org/less/-/less-1.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/less/-/less-1.7.3.tgz",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"clean-css": {
|
"clean-css": {
|
||||||
"version": "2.1.8",
|
"version": "2.1.8",
|
||||||
@ -1159,6 +1153,10 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"graceful-fs": {
|
||||||
|
"version": "2.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
|
||||||
|
},
|
||||||
"mime": {
|
"mime": {
|
||||||
"version": "1.2.11",
|
"version": "1.2.11",
|
||||||
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
|
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
|
||||||
@ -1168,8 +1166,8 @@
|
|||||||
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
|
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
|
||||||
},
|
},
|
||||||
"request": {
|
"request": {
|
||||||
"version": "2.36.0",
|
"version": "2.34.0",
|
||||||
"resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
|
"resolved": "https://registry.npmjs.org/request/-/request-2.34.0.tgz",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"aws-sign2": {
|
"aws-sign2": {
|
||||||
"version": "0.5.0",
|
"version": "0.5.0",
|
||||||
@ -1266,8 +1264,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tunnel-agent": {
|
"tunnel-agent": {
|
||||||
"version": "0.4.0",
|
"version": "0.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
|
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -2896,8 +2894,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"load-grunt-tasks": {
|
"load-grunt-tasks": {
|
||||||
"version": "0.5.0",
|
"version": "0.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-0.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-0.6.0.tgz",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"findup-sync": {
|
"findup-sync": {
|
||||||
"version": "0.1.3",
|
"version": "0.1.3",
|
||||||
@ -2934,12 +2932,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"multimatch": {
|
"multimatch": {
|
||||||
"version": "0.2.0",
|
"version": "0.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-0.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-0.3.0.tgz",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"lodash": {
|
"array-differ": {
|
||||||
"version": "2.4.1",
|
"version": "0.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
|
"resolved": "https://registry.npmjs.org/array-differ/-/array-differ-0.1.0.tgz"
|
||||||
|
},
|
||||||
|
"array-union": {
|
||||||
|
"version": "0.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/array-union/-/array-union-0.1.0.tgz",
|
||||||
|
"dependencies": {
|
||||||
|
"array-uniq": {
|
||||||
|
"version": "0.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-0.1.0.tgz"
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"minimatch": {
|
"minimatch": {
|
||||||
"version": "0.3.0",
|
"version": "0.3.0",
|
||||||
@ -2976,8 +2984,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npm-shrinkwrap": {
|
"npm-shrinkwrap": {
|
||||||
"version": "3.1.4",
|
"version": "3.1.6",
|
||||||
"resolved": "https://registry.npmjs.org/npm-shrinkwrap/-/npm-shrinkwrap-3.1.4.tgz",
|
"resolved": "https://registry.npmjs.org/npm-shrinkwrap/-/npm-shrinkwrap-3.1.6.tgz",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"array-find": {
|
"array-find": {
|
||||||
"version": "0.1.1",
|
"version": "0.1.1",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user