Skip to content

Commit

Permalink
Merge pull request #4437 from jaswilli/deps
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
novaugust committed Nov 13, 2014
2 parents 071c795 + 1b8fa01 commit 7b84e54
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"jquery-ui": "1.10.4",
"keymaster": "git://github.com/madrobby/keymaster#564ea42e07de40da8113a571f17ceae8802672ff",
"loader.js": "git://github.com/stefanpenner/loader.js#1.0.0",
"moment": "2.4.0",
"moment": "2.8.3",
"nanoscroller": "0.8.4",
"normalize-scss": "~3.0.1",
"nprogress": "0.1.2",
"showdown": "git://github.com/ErisDS/showdown.git#v0.3.2-ghost",
"validator-js": "3.4.0",
"validator-js": "3.22.1",
"google-caja": "5669.0.0"
}
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
"compression": "1.2.0",
"connect-slashes": "1.2.0",
"downsize": "0.0.5",
"express": "4.9.2",
"express": "4.10.2",
"express-hbs": "0.7.11",
"fs-extra": "0.12.0",
"html-to-text": "1.0.0",
"knex": "0.6.21",
"knex": "0.7.3",
"lodash": "2.4.1",
"moment": "2.4.0",
"moment": "2.8.3",
"morgan": "1.3.1",
"node-uuid": "1.4.1",
"nodemailer": "0.7.1",
Expand All @@ -61,7 +61,7 @@
"showdown": "https://github.com/ErisDS/showdown/archive/v0.3.2-ghost.tar.gz",
"sqlite3": "3.0.2",
"unidecode": "0.1.3",
"validator": "3.4.0",
"validator": "3.22.1",
"xml": "0.0.12"
},
"optionalDependencies": {
Expand All @@ -87,7 +87,7 @@
"grunt-es6-module-transpiler": "~0.6.0",
"grunt-express-server": "~0.4.19",
"grunt-jscs": "~0.8.1",
"grunt-mocha-cli": "~1.10.0",
"grunt-mocha-cli": "~1.11.0",
"grunt-sass": "~0.16.1",
"grunt-shell": "~1.1.1",
"grunt-update-submodules": "~0.4.1",
Expand Down

0 comments on commit 7b84e54

Please sign in to comment.