Merge branch 'MDL-60924-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 07:38:04 +0000 (09:38 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 07:38:04 +0000 (09:38 +0200)
commite3852300469e8ecb96f54cc526ac252c66ab79ec
tree6a8f82ce2e4cf8ad2eb8676853e717bb4d9f3f15
parent9e52f4adc2666e667a46e16a0200f6440b1af410
parent7fde83584fb4bdcdca8b3704939322551c453843
Merge branch 'MDL-60924-master' of git://github.com/sarjona/moodle