Merge branch 'MDL-62172-master' of git://github.com/bmbrands/moodle
commitd8844b3f8c05827a7e75f65c16cf0c484268a27e
authorJun Pataleta <jun@moodle.com>
Fri, 27 Apr 2018 01:55:08 +0000 (27 09:55 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 27 Apr 2018 01:55:08 +0000 (27 09:55 +0800)
tree69adbf8e7abea5d0dd0a983ec8eab24233a8aaa3
parent9827740b019995eeafe68250b708cedd77501d62
parentd24fab11827b89e9a227fd58ae29dde36c0b74d1
Merge branch 'MDL-62172-master' of git://github.com/bmbrands/moodle