Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle
commit7a9717f614c7d29a0d854fc9f065b54804dd741b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 15 Nov 2018 10:04:12 +0000 (15 11:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 15 Nov 2018 10:04:12 +0000 (15 11:04 +0100)
tree34e554bf7bd4ddda2539177507adcb709b983813
parent6a7ee95231acb8a50206f4400f5005c982d69f79
parent132626720ce6b18f1365fb7a87cf282886e3c344
Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle