Merge branch 'mdl63334-master' of https://github.com/tlock/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 3 Oct 2018 15:19:18 +0000 (17:19 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 3 Oct 2018 15:19:18 +0000 (17:19 +0200)
commit1ef89ad49cfc09e17e25dcfbad5a00218bc3eb41
treee3c77365c578ef1f52f7de90deff340b90cfc05b
parentd6946bb0f9706184f7d8830862e39e5c376627c1
parent394d0f15d9e0a2610e39c49182dcb8969db25b09
Merge branch 'mdl63334-master' of https://github.com/tlock/moodle