Merge branch 'MDL-40613_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 2 Jan 2018 08:50:29 +0000 (16:50 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 2 Jan 2018 08:50:29 +0000 (16:50 +0800)
commit1588837a9de7f27f4957f740b7f23c967e2249b1
tree94a6424ec60028464d957a1f958575c026c2e9bf
parent6ffb51e74c333465550fc50badec7d3490b91c5e
parent55595bcfcb5fe43d7e76c653244188b0bbf75b88
Merge branch 'MDL-40613_master' of git://github.com/markn86/moodle