Merge branch 'MDL-62988_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 22 Nov 2018 22:15:54 +0000 (23:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 22 Nov 2018 22:15:54 +0000 (23:15 +0100)
commit78fd9a2b539f069d936f77f63e60632b3b2d235e
treecaa53602cf8ba0e23dd5a023f54ed2621681c4ba
parentc039ba73419590656c185212533bd31be1f7998e
parentc30a2c99030285a00b4551a217e1e5061729299f
Merge branch 'MDL-62988_master' of git://github.com/markn86/moodle