Merge branch 'MDL-62419-master' of git://github.com/bmbrands/moodle
commit12ef4a1219ab3ec9d706dca533933914f631d419
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 14:56:37 +0000 (15 16:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 14:56:37 +0000 (15 16:56 +0200)
tree70e57c8b2e60412b5f1b942445ad20423b3006d2
parentbcd677bc6a51717a827403be34b4de1442d178e6
parentb188407bdc8c4fc022678aa1b99565e7702e2fc6
Merge branch 'MDL-62419-master' of git://github.com/bmbrands/moodle