Merge branch 'MDL-60638-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 6 Nov 2017 20:45:14 +0000 (21:45 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 6 Nov 2017 20:45:14 +0000 (21:45 +0100)
commitbe88f0993dc11158da4ec127fb0be3868c17754b
tree423659da19fdf643bc16a986dfd0ac4d8fe77b12
parent40f05d23125a7075d2994f17968d42b9d341f922
parent20a5056df6bbad0536e8e8ea6ec712c9380da40e
Merge branch 'MDL-60638-master' of git://github.com/lameze/moodle