Merge branch 'MDL-65958-36-v3' of git://github.com/lameze/moodle into MOODLE_36_STABLE
commitc53515f170f85e652e2ebf05caa985768dddb5c6
authorSara Arjona <sara@moodle.com>
Wed, 3 Jul 2019 12:53:52 +0000 (3 14:53 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 3 Jul 2019 12:53:52 +0000 (3 14:53 +0200)
treea7d552371b1c744b6110ef0a2c09197066ea52df
parenta76b3ea7c865251ad149f60a90b379f352602f32
parent5aaf5d99d7ef09c64f38f3d905aa77ab285ae922
Merge branch 'MDL-65958-36-v3' of git://github.com/lameze/moodle into MOODLE_36_STABLE