Hakim El Hattab ce55d1a179 fix merge conflict for #1634 9 gadi atpakaļ
..
reveal.js ce55d1a179 fix merge conflict for #1634 9 gadi atpakaļ