Merge branch 'presenter_notes_server' of https://github.com/rmurphey/reveal.js into...
authorHakim El Hattab <hakim.elhattab@gmail.com>
Sun, 1 Jul 2012 05:57:23 +0000 (01:57 -0400)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Sun, 1 Jul 2012 05:57:23 +0000 (01:57 -0400)
1  2 
README.md
css/main.css

diff --cc README.md
Simple merge
diff --cc css/main.css
Simple merge