Merge branch 'MDL-61973-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 May 2018 01:47:10 +0000 (09:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 May 2018 01:47:10 +0000 (09:47 +0800)
commitdfa16c06a65510aeb53b02b22443b3370cc8037d
treef96482b65eedb2f7ed6d3ea42e6ed2f84abc4adc
parent34dd6c69abca91cbd781660496e6ffb1e2185173
parent7e4bffd83601d1d7bda35a2463122093900b96ab
Merge branch 'MDL-61973-master' of git://github.com/mickhawkins/moodle
lib/editor/atto/db/upgrade.php
lib/editor/atto/version.php