Merge branch 'MDL-47979-master-blocks-config' of git://github.com/mudrd8mz/moodle
commitf62d6ffa3d6850ba358924fc0ea12e63c2a58eb7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Nov 2015 22:42:26 +0000 (9 23:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Nov 2015 22:42:26 +0000 (9 23:42 +0100)
tree397cb95d296cce7d3514dc79228c9899c3785bce
parentd1bd3274548da1599da8a88baab39a964189818c
parent8159f23e76d89db8c0604aea70b53a32636ef06b
Merge branch 'MDL-47979-master-blocks-config' of git://github.com/mudrd8mz/moodle