Merge branch 'MDL-62249-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 12:23:10 +0000 (14:23 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:27 +0000 (09:17 +0800)
commit1b764a2fdecd89af57a0fc519af2a7c9108f71ac
tree3776287575b92c6653f051091f2613ab9c94cf4e
parent99a080f12a502a4807e0b11bb91ce43a7402d7cf
parente151fdad928a097ad01f6949d5ab7588c2af07a3
Merge branch 'MDL-62249-master' of git://github.com/zig-moodle/moodle