Merge branch 'master' of github.com:hakimel/reveal.js into dev

2016-01-08 10:25:44 +01:00 · 2016-01-08 10:25:44 +01:00 · fb00a5d613
commit fb00a5d613
parent fcb4b05de7 1d6848a782
2 changed files with 10 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,8 @@
+.idea/
+*.iml
+*.iws
+*.eml
+out/
 .DS_Store
 .svn
 log/*.log
--- a/package.json
+++ b/package.json
@ -22,10 +22,11 @@
    "node": "~4.1.1"
  },
  "dependencies": {
-    "underscore": "~1.8.3",
    "express": "~4.13.3",
-    "mustache": "~2.1.3",
-    "socket.io": "~1.3.7"
+    "grunt-cli": "^0.1.13",
+    "mustache": "~2.2.1",
+    "socket.io": "~1.3.7",
+    "underscore": "~1.8.3"
  },
  "devDependencies": {
    "grunt-contrib-qunit": "~0.7.0",