Merge branch 'wip-MDL-59496-master-3' of git://github.com/marinaglancy/moodle
commita79e84e06076e30d63822ad1e82fc0683a3afff2
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 15:14:56 +0000 (31 17:14 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 15:14:56 +0000 (31 17:14 +0200)
tree865707ff8b0a7dec97a7a0c1a2bf2b4a3f4f30aa
parentf4ba6def50df00af81b90061e50cef1862600e93
parent505bbe7cd684363eefa5d92199be78ffc2ece76b
Merge branch 'wip-MDL-59496-master-3' of git://github.com/marinaglancy/moodle