Merge branch 'master' of github.com:hakimel/reveal.js into dev
This commit is contained in:
commit
fb00a5d613
|
@ -1,3 +1,8 @@
|
||||||
|
.idea/
|
||||||
|
*.iml
|
||||||
|
*.iws
|
||||||
|
*.eml
|
||||||
|
out/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.svn
|
.svn
|
||||||
log/*.log
|
log/*.log
|
||||||
|
|
|
@ -22,10 +22,11 @@
|
||||||
"node": "~4.1.1"
|
"node": "~4.1.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"underscore": "~1.8.3",
|
|
||||||
"express": "~4.13.3",
|
"express": "~4.13.3",
|
||||||
"mustache": "~2.1.3",
|
"grunt-cli": "^0.1.13",
|
||||||
"socket.io": "~1.3.7"
|
"mustache": "~2.2.1",
|
||||||
|
"socket.io": "~1.3.7",
|
||||||
|
"underscore": "~1.8.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"grunt-contrib-qunit": "~0.7.0",
|
"grunt-contrib-qunit": "~0.7.0",
|
||||||
|
|
Loading…
Reference in New Issue