Merge branch 'fix-callback-with-shared-dir' of https://github.com/hashar/reveal.js
authorHakim El Hattab <hakim.elhattab@gmail.com>
Tue, 13 Nov 2012 14:37:37 +0000 (09:37 -0500)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Tue, 13 Nov 2012 14:37:37 +0000 (09:37 -0500)
1  2 
js/reveal.js

diff --cc js/reveal.js
Simple merge