Merge branch 'MDL-63817-master' of git://github.com/peterRd/moodle
commit94db315b50c307906ccf03e00b019e4f71eea2ef
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Nov 2018 09:49:15 +0000 (19 10:49 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Nov 2018 09:49:15 +0000 (19 10:49 +0100)
tree9be136c9bcfcdd2313ac543530bf684dd5e5a9c4
parenta356db0db2c137bf2f3c8d55c49cb1f191df25ce
parent2044a539466ebf4d96dca921c55720417e75b322
Merge branch 'MDL-63817-master' of git://github.com/peterRd/moodle