diff options
author | navateja | 2014-06-09 14:44:36 +0530 |
---|---|---|
committer | navateja | 2014-06-09 14:44:36 +0530 |
commit | 594d9f6d85f6b1c6a953a64892cd2236529f0398 (patch) | |
tree | 16caf49a3ccd1db02996f35fd89af09515a74e27 /package.json | |
parent | ab7efe6bf2da9b31b31a3af859e9f7f413fd2d0d (diff) | |
parent | 8973f0c3e19ffafee489a3dcfce03303120ed22b (diff) |
Merge remote-tracking branch 'upstream/dev' into keyboard_shortcuts_overlay
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index 5debdd2..edc5981 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reveal.js", - "version": "2.6.2", + "version": "3.0.0-dev", "description": "The HTML Presentation Framework", "homepage": "http://lab.hakim.se/reveal-js", "subdomain": "revealjs", @@ -24,7 +24,7 @@ "underscore": "~1.5.1", "express": "~2.5.9", "mustache": "~0.7.2", - "socket.io": "~0.9.13" + "socket.io": "~0.9.16" }, "devDependencies": { "grunt-contrib-qunit": "~0.2.2", @@ -33,7 +33,7 @@ "grunt-contrib-uglify": "~0.2.4", "grunt-contrib-watch": "~0.5.3", "grunt-contrib-sass": "~0.5.0", - "grunt-contrib-connect": "~0.4.1", + "grunt-contrib-connect": "~0.5.0", "grunt-zip": "~0.7.0", "grunt": "~0.4.0" }, |