Merge branch 'master_MDL-65502' of https://github.com/danmarsden/moodle
authorSara Arjona <sara@moodle.com>
Thu, 9 May 2019 14:48:05 +0000 (16:48 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 9 May 2019 14:48:05 +0000 (16:48 +0200)
commit5ec0b3bc2e6ac499ffdb116627dd26c1d2f1644e
tree56b46a8a63fb37741ad8f21f32138e45f258b840
parentc9e526a4e79a0fc43fa63e2a0ddbd949b8af9094
parent8e119e4bb314d4453201dd7f7822875e91fe1124
Merge branch 'master_MDL-65502' of https://github.com/danmarsden/moodle
blocks/moodleblock.class.php