Merge branch 'MDL-50225_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Aug 2018 00:14:55 +0000 (08:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Aug 2018 00:14:55 +0000 (08:14 +0800)
commit03655bb050a929dd0ae8837b39124a386a03cbcd
tree6533e0ff0568570b1612b7a2a746eb735bfc5f13
parentbc7ee099aef960b726f28208207cc81642404636
parent4d67fe61613d90287f4bd89f6efb3bcd786ddc63
Merge branch 'MDL-50225_master' of git://github.com/markn86/moodle
lib/deprecatedlib.php
lib/form/htmleditor.php
lib/outputrenderers.php
lib/upgrade.txt