Merge branch 'MDL-63887_master' of git://github.com/markn86/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 12 Dec 2018 01:41:34 +0000 (09:41 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 12 Dec 2018 01:41:34 +0000 (09:41 +0800)
commit84e8e178205d627cf0d95993b3cdd136fd9b2467
treea70b85a275d60838f900088b7bc6fc7ebb959150
parentf9479eb8cabeb0a198535af47998ae736b3ed86f
parent43dcb956ba14802cae6baab1ce9fe6ccd83e0e0b
Merge branch 'MDL-63887_master' of git://github.com/markn86/moodle