Merge branch 'MDL-49988_fix_wiki_preview' of https://github.com/DMaterka/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 May 2017 22:30:08 +0000 (00:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 May 2017 22:30:08 +0000 (00:30 +0200)
commit32a627d7cf9d1886ec25eba7170dde934e3592c7
treefe3156165a757882fd01eb43f5f71e3345d3d777
parent1a07f9f0371c07ab2b03454f9c6dd2a825e47004
parent5058a4d199f484b0712fe3399db7404a760899d8
Merge branch 'MDL-49988_fix_wiki_preview' of https://github.com/DMaterka/moodle