Merge branch 'MDL-68450-master' of git://github.com/cescobedo/moodle
authorSara Arjona <sara@moodle.com>
Mon, 18 May 2020 14:16:23 +0000 (16:16 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 18 May 2020 14:16:23 +0000 (16:16 +0200)
commit149b60f242a7bf6766201f178666253c4606ca4c
treef642e7e7c6c52e004adb6a351900fe44ed1755e0
parent5fb2abb4ebf9cbbfc4a43eb5382ff6f47ee5fba0
parenta9ed34a944b6c7ac0e0346f3ba51c16cdefbd24c
Merge branch 'MDL-68450-master' of git://github.com/cescobedo/moodle
mod/h5pactivity/db/services.php
mod/h5pactivity/version.php