Merge branch 'MDL-64149-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Nov 2018 15:14:42 +0000 (16:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Nov 2018 15:14:42 +0000 (16:14 +0100)
commitcbd6122e27496adecbb86ad27b084bc953ae6b33
tree91bfdf5f1f3583fa29b2512f139fadba96d7b941
parent70abb41263a013fab955fcf7a2fc1ef4a0c62607
parentae09cccf5a243d086ce86d8b46fae94b147fea1e
Merge branch 'MDL-64149-master' of git://github.com/sarjona/moodle