Skip to content
Snippets Groups Projects
Commit 61c229a4 authored by David Banham's avatar David Banham
Browse files

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

Conflicts:
	README.md
	index.html
	js/reveal.js
	package.json
	plugin/speakernotes/client.js
parents 26d5febd 7081f901
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2276 additions and 607 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment