merge master into dev

edit
Hakim El Hattab 2014-03-25 21:37:51 +01:00
commit 17d8f0b77c
2 changed files with 16 additions and 16 deletions

6
js/reveal.min.js vendored

File diff suppressed because one or more lines are too long