Merge branch 'MDL-62162-master' of git://github.com/sarjona/moodle
commitd11786cee30c28d173f28a73caaadca446528777
authorJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 02:25:33 +0000 (24 10:25 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 02:25:33 +0000 (24 10:25 +0800)
treef73f898b8c9d00b72c1a52b060b379c8faa416df
parent3bdcd4d8c321e508775f5cdff29592b627a57914
parent077ebb2a0b64422c2839f9a2780a77065b65f1a5
Merge branch 'MDL-62162-master' of git://github.com/sarjona/moodle