Merge branch 'MDL-61915-master' of git://github.com/cescobedo/moodle
commit3d7b805f4e5c4b903af358d406f97cd5a09a2c71
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Apr 2018 14:26:06 +0000 (23 16:26 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Apr 2018 14:26:06 +0000 (23 16:26 +0200)
treeb512ca0f5e0283739fa6c8c121f3bdf26a709b48
parent590c774d37684f9c717793fa81049ae1374ba277
parent980e85cd4408b7ee0ddaef58f7303d5609f5d37a
Merge branch 'MDL-61915-master' of git://github.com/cescobedo/moodle