Merge branch 'bstable'

This commit is contained in:
ccd0 2015-02-22 00:35:02 -08:00
commit 6a9a46dca3
2 changed files with 16 additions and 15 deletions

27
npm-shrinkwrap.json generated
View File

@ -1,6 +1,7 @@
{
"name": "4chan-X",
"npm-shrinkwrap-version": "5.1.0",
"npm-shrinkwrap-version": "5.2.0",
"node-version": "v0.10.29",
"dependencies": {
"font-awesome": {
"version": "4.3.0",
@ -481,8 +482,8 @@
}
},
"grunt-contrib-concat": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-0.5.0.tgz",
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-0.5.1.tgz",
"dependencies": {
"chalk": {
"version": "0.5.1",
@ -523,8 +524,8 @@
}
},
"source-map": {
"version": "0.1.43",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
"dependencies": {
"amdefine": {
"version": "0.1.0",
@ -1131,8 +1132,8 @@
}
},
"npm-shrinkwrap": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/npm-shrinkwrap/-/npm-shrinkwrap-5.1.0.tgz",
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/npm-shrinkwrap/-/npm-shrinkwrap-5.2.0.tgz",
"dependencies": {
"array-find": {
"version": "0.1.1",
@ -1171,8 +1172,8 @@
"resolved": "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz",
"dependencies": {
"heap": {
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/heap/-/heap-0.2.5.tgz"
"version": "0.2.6",
"resolved": "https://registry.npmjs.org/heap/-/heap-0.2.6.tgz"
}
}
},
@ -1235,8 +1236,8 @@
}
},
"marked": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.2.tgz"
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.3.tgz"
},
"nopt": {
"version": "2.1.2",
@ -1693,8 +1694,8 @@
"resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-2.0.0.tgz"
},
"semver": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-4.2.0.tgz"
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-4.3.0.tgz"
},
"sorted-object": {
"version": "1.0.0",

View File

@ -47,7 +47,7 @@
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-coffee": "^0.12.0",
"grunt-contrib-compress": "^0.13.0",
"grunt-contrib-concat": "^0.5.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-copy": "^0.7.0",
"grunt-contrib-jshint": "^0.11.0",
"grunt-contrib-watch": "^0.6.1",
@ -55,7 +55,7 @@
"grunt-markdown": "^0.7.0",
"grunt-shell": "^1.1.1",
"load-grunt-tasks": "^3.1.0",
"npm-shrinkwrap": "^5.1.0"
"npm-shrinkwrap": "^5.2.0"
},
"repository": {
"type": "git",