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)
1  2 
blocks/moodleblock.class.php

Simple merge