Merge branch 'MDL-60951-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 7 Dec 2017 04:33:41 +0000 (17:33 +1300)
committerJun Pataleta <jun@moodle.com>
Thu, 7 Dec 2017 04:33:41 +0000 (17:33 +1300)
commit4ffbf22046b4057e944acf9e988823ceab31bbd2
tree48f72bd9658b65e6e3c1f3fb37493125a4712c86
parent97812f14c1bb7d70d80cd483f58e44ac37d3cd50
parent3715c59ef9e6e49bae9869dee62397427c2d18d5
Merge branch 'MDL-60951-master' of git://github.com/damyon/moodle