Merge branch 'wip-MDL-61175-master' of https://github.com/kwiliarty/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 00:24:44 +0000 (01:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 00:24:44 +0000 (01:24 +0100)
commit66915b0ea16d030fb872d98665eb4c5dd3960703
treef7ca38503d186c137848f1dc8365aba0d2e7e78a
parentb0bb30e2e76a14375193eefead6d79b214c6236a
parenta0b9bf4998e031fc67e5cd292bedf2bb15eb78ca
Merge branch 'wip-MDL-61175-master' of https://github.com/kwiliarty/moodle