Merge branch 'MDL-59670-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Aug 2017 22:41:57 +0000 (00:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Aug 2017 22:41:57 +0000 (00:41 +0200)
commitcace54811df37db4631c478653662ccc067eb03c
treeca9e3b321bfb32c2eabe21014f162add8528d50d
parent9317ceefcf2c5e8f9845b0f0ff066b6c50e81bd9
parenta49c3d8aa0743e13aa7dbb8f365b7084f48f3d60
Merge branch 'MDL-59670-master' of git://github.com/andrewnicols/moodle