Merge branch 'deps-update' of https://github.com/verdurin/reveal.js into dev
This commit is contained in:
		| @@ -948,7 +948,7 @@ Reveal.initialize({ | |||||||
| 	// other options ... | 	// other options ... | ||||||
|  |  | ||||||
| 	math: { | 	math: { | ||||||
| 		mathjax: 'http://cdn.mathjax.org/mathjax/latest/MathJax.js', | 		mathjax: 'https://cdn.mathjax.org/mathjax/latest/MathJax.js', | ||||||
| 		config: 'TeX-AMS_HTML-full'  // See http://docs.mathjax.org/en/latest/config-files.html | 		config: 'TeX-AMS_HTML-full'  // See http://docs.mathjax.org/en/latest/config-files.html | ||||||
| 	}, | 	}, | ||||||
| 	 | 	 | ||||||
|   | |||||||
							
								
								
									
										32
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										32
									
								
								package.json
									
									
									
									
									
								
							| @@ -19,26 +19,26 @@ | |||||||
|     "url": "git://github.com/hakimel/reveal.js.git" |     "url": "git://github.com/hakimel/reveal.js.git" | ||||||
|   }, |   }, | ||||||
|   "engines": { |   "engines": { | ||||||
|     "node": "~0.10.0" |     "node": "~4.1.1" | ||||||
|   }, |   }, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "underscore": "~1.5.1", |     "underscore": "~1.8.3", | ||||||
|     "express": "~2.5.9", |     "express": "~4.13.3", | ||||||
|     "mustache": "~0.7.2", |     "mustache": "~2.1.3", | ||||||
|     "socket.io": "~0.9.16" |     "socket.io": "~1.3.7" | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "grunt-contrib-qunit": "~0.5.2", |     "grunt-contrib-qunit": "~0.7.0", | ||||||
|     "grunt-contrib-jshint": "~0.6.4", |     "grunt-contrib-jshint": "~0.11.3", | ||||||
|     "grunt-contrib-cssmin": "~0.12.2", |     "grunt-contrib-cssmin": "~0.14.0", | ||||||
|     "grunt-contrib-uglify": "~0.2.4", |     "grunt-contrib-uglify": "~0.9.2", | ||||||
|     "grunt-contrib-watch": "~0.5.3", |     "grunt-contrib-watch": "~0.6.1", | ||||||
|     "grunt-sass": "~0.14.0", |     "grunt-sass": "~1.1.0-beta", | ||||||
|     "grunt-contrib-connect": "~0.8.0", |     "grunt-contrib-connect": "~0.11.2", | ||||||
|     "grunt-autoprefixer": "~1.0.1", |     "grunt-autoprefixer": "~3.0.3", | ||||||
|     "grunt-zip": "~0.7.0", |     "grunt-zip": "~0.17.1", | ||||||
|     "grunt": "~0.4.0", |     "grunt": "~0.4.5", | ||||||
|     "node-sass": "~0.9.3" |     "node-sass": "~3.3.3" | ||||||
|   }, |   }, | ||||||
|    |    | ||||||
|   "license": "MIT" |   "license": "MIT" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user