Hakim El Hattab 8582c9aac8 resolve notes merge conflict il y a 6 ans
..
reveal.js 8582c9aac8 resolve notes merge conflict il y a 6 ans