Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 11:00:46 +0000 (12:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 11:00:46 +0000 (12:00 +0100)
commitab73c1ddbb6b38c7897bd4e2dfb83d374ad5bf46
tree1e6928c2efba6a0c633c51946e3b583e928012a5
parentbd31523a308b843fc7f73047cbcf278b0164797c
parent3118ff6f41db17b60b187485d46b62a2e9f8d9aa
Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle
lib/blocklib.php