Merge branch 'MDL-63442-master' of git://github.com/abias/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 4 Oct 2018 03:02:34 +0000 (11:02 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 4 Oct 2018 03:02:34 +0000 (11:02 +0800)
commit86abaf31c8c0fac00376bacd6f772120e8e59675
treeebefe768ff6ce4c56a08790d0eeeb83a691e7cb2
parent83c249a665cff6e5b9a0f678d11cc5e760a8985d
parent3e24741d0a633bfaea45e3340968fce17bacf107
Merge branch 'MDL-63442-master' of git://github.com/abias/moodle
lang/en/moodle.php
lib/outputrenderers.php