Merge branch 'MDL-62713-master' of https://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 2 Jul 2018 08:40:40 +0000 (10:40 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 2 Jul 2018 08:40:40 +0000 (10:40 +0200)
commite460c9589363a67684ac49bc4d5414d9d74426f0
treec2b71b4c9019e3af51392f12db39e7899a069504
parent744a9de33952ae44d708bd3064d49ebabf8547c3
parent23f6a88341537695b38ed4ea07acd30fd57334f0
Merge branch 'MDL-62713-master' of https://github.com/sammarshallou/moodle