Merge branch 'MDL-58295-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 10 Apr 2017 08:51:06 +0000 (16:51 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 10 Apr 2017 08:51:06 +0000 (16:51 +0800)
commit60b6e1bf0b0b2f67324feeceef16e13bf37da06a
treed06ba94254cb61d393bfb89c01f868857ac5ac74
parent7841e9f337b1d290fa5cfd52f990c1e828016b08
parent9d6698060fbaa21b88c1e912742b67e374271eb7
Merge branch 'MDL-58295-master' of git://github.com/andrewnicols/moodle
files/classes/converter.php
files/converter/unoconv/classes/converter.php