Merge branch 'MDL-65435_35' of git://github.com/stronk7/moodle into MOODLE_35_STABLE
commit02dc7147c708254d302e1bb854fd60e37d94df62
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 9 May 2019 06:52:13 +0000 (9 14:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 9 May 2019 06:52:13 +0000 (9 14:52 +0800)
tree10d428e09310fe746f4fe7c2ba9d007d6335d356
parent8ab8dee8c9b7a730eb30d095daca5d70621d4ed8
parent33f22e1e830a8ec7207a5b956928d397c40565bb
Merge branch 'MDL-65435_35' of git://github.com/stronk7/moodle into MOODLE_35_STABLE