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

edit
Hakim El Hattab 2016-01-08 10:25:44 +01:00
commit fb00a5d613
2 changed files with 10 additions and 4 deletions

5
.gitignore vendored
View File

@ -1,3 +1,8 @@
.idea/
*.iml
*.iws
*.eml
out/
.DS_Store
.svn
log/*.log

View File

@ -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",