Merge branch 'MDL-57386-master' of git://github.com/damyon/moodle
commitcaf52b578b69809751c37e7bbde10e9c09db35ec
authorDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 15:46:54 +0000 (19 15:46 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 15:46:54 +0000 (19 15:46 +0000)
tree632807ad25a6107d0baef2b6197ea3f8b9a73ab6
parent7d64e2c3bc0b0ec58368d6c339375713bb2bb0db
parent08d7c0e1ca8d7d6006ac89b7eed7885d7b23999a
Merge branch 'MDL-57386-master' of git://github.com/damyon/moodle
lib/blocklib.php