Hakim El Hattab ce55d1a179 fix merge conflict for #1634 8 år sedan
..
reveal.js ce55d1a179 fix merge conflict for #1634 8 år sedan