Merge branch 'MDL-63138-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Sep 2018 14:39:58 +0000 (16:39 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 18 Sep 2018 14:39:58 +0000 (16:39 +0200)
commit542201d54720ed8aed1fc18df568f6c885b4d479
tree5f087ef2f3e93c8f7127f311dcb37e94147f2506
parent11decdb19ce42c5b0640da1d3074ecb6d53947e0
parentac0f38b1d84e8d18b2e0175c5c50b3ed594d0a05
Merge branch 'MDL-63138-master' of git://github.com/rezaies/moodle