Merge branch 'MDL-61098-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 20:06:13 +0000 (21:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 20:06:13 +0000 (21:06 +0100)
commitabe4713565e0b227874ddca2463134af61504618
tree90f381a13a474ed8509e53808e409fb103a32d4f
parent8d9a55a05b60ff8f614916c6f37817ddfa9725f0
parentb857590479896fe89325898e44f5d1fc1a23672e
Merge branch 'MDL-61098-master' of git://github.com/jleyva/moodle