merge conflicts w preview & backgrounds

Browse source

...

This commit is contained in:

Hakim El Hattab 2013-06-10 16:53:41 -04:00

parent 8b355eaba0 424f8ee961

commit 7094f44eb9

14 changed files with 509 additions and 75 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

js/reveal.min.js vendored

View file

File diff suppressed because one or more lines are too long