merge conflicts w preview & backgrounds
authorHakim El Hattab <hakim.elhattab@gmail.com>
Mon, 10 Jun 2013 20:53:41 +0000 (16:53 -0400)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Mon, 10 Jun 2013 20:53:41 +0000 (16:53 -0400)
commit7094f44eb9668f43046836936d1a925fc8698e49
treed5206ace53b767ed4a9836c300cdfa7d5f7bd041
parent8b355eaba0aa1fc51c8284b02f3f9a6f7ab64410
parent424f8ee9618803d96a31d363597d0b25f876497f
merge conflicts w preview & backgrounds
css/reveal.css
css/reveal.min.css
js/reveal.js
js/reveal.min.js