Michael Kühnel 5af915adaf Merge branch 'refs/heads/fix-fragments-in-speakernotes' into fragments-in-notes-server ...

Conflicts:
	js/reveal.min.js

Need to generate a new minified version afterwards.

2012-10-24 17:48:50 +02:00

..

client.js

Merge branch 'refs/heads/fix-fragments-in-speakernotes' into fragments-in-notes-server

2012-10-24 17:48:50 +02:00

index.js

Merge branch 'refs/heads/fix-fragments-in-speakernotes' into fragments-in-notes-server

2012-10-24 17:48:50 +02:00

notes.html

Merge branch 'refs/heads/fix-fragments-in-speakernotes' into fragments-in-notes-server

2012-10-24 17:48:50 +02:00