Merge branch 'wip-MDL-62493-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 28 May 2018 05:01:09 +0000 (13:01 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 28 May 2018 05:01:09 +0000 (13:01 +0800)
commit8a930e444bd5b19a8e1751dce3a426e507254620
tree9df572ca3c2b3adaf26d22219a6aa6f320afc80c
parent87095d14054fca52abe76805279aa2d0af5e1e0b
parent7115c329498c5836386876e6e4063f8e8fd14366
Merge branch 'wip-MDL-62493-master' of git://github.com/marinaglancy/moodle