Merge branch 'MDL-60041' of https://github.com/NeillM/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 01:13:43 +0000 (09:13 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 01:13:43 +0000 (09:13 +0800)
commit4786443998663b5276f0f2165910e45674376adf
tree675142feb6ee1f0253c387a42a6eaf898c5fbd1b
parent34adfcb4eeb73f022488c4540f53a75a6bf2054d
parent61fad215f1b64e2e50175da6b3c6d6763ac3cf85
Merge branch 'MDL-60041' of https://github.com/NeillM/moodle