Merge branch 'wip-MDL-61808-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 07:59:43 +0000 (09:59 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 07:59:43 +0000 (09:59 +0200)
commit2ffb0309ddd289f36801c04992ce7968b89d2c35
tree2f3e3cf75a3e6712240458f5510ef18ddc70c951
parent1e09c9ac8f7decd465665fe29b278e3c269023d3
parent25c8fd74acb2c8cd8728af10c2a52507c7cbe4ec
Merge branch 'wip-MDL-61808-master' of git://github.com/abgreeve/moodle