Merge branch 'MDL-63748-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE
commit273486c49e75d970e9c7dbac9c8b569c778c70f2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Nov 2018 12:11:59 +0000 (5 13:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Nov 2018 12:11:59 +0000 (5 13:11 +0100)
tree60db5301e4c3d29932e713d58bc6b5e8efcc4049
parentd85a4a9900afa038a707676f0daaf992a83475d4
parent3d4bef51faf862772d82be2a03e78d6cf17868e5
Merge branch 'MDL-63748-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE