xobs/fa23-si
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hakim El Hattab 2016-01-08 10:25:44 +01:00
commit fb00a5d613
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -1,3 +1,8 @@
.idea/
*.iml
*.iws
*.eml
out/
.DS_Store .DS_Store
.svn .svn
log/*.log log/*.log
@ -5,4 +10,4 @@ tmp/**
node_modules/ node_modules/
.sass-cache .sass-cache
css/reveal.min.css css/reveal.min.css
js/reveal.min.js js/reveal.min.js

7
package.json
View File

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