Merge branch 'MDL-62638-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 00:03:08 +0000 (02:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 00:03:08 +0000 (02:03 +0200)
commit9153d6ea05e26ae9c8f62ec5eb2b9d98b6c43c6e
tree4b759775e61f113f68a5daac97371db510a6692d
parenteeb0597493011b8bc863670bcd9eecd9a57c34e2
parentab17aad5691d376fdf2e60e7370d3b48b573b581
Merge branch 'MDL-62638-master' of git://github.com/bmbrands/moodle