Merge branch 'MDL-61951-master' of git://github.com/sarjona/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 11 May 2018 02:18:58 +0000 (10:18 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 11 May 2018 02:18:58 +0000 (10:18 +0800)
commit6f213a2fa236be5a1dbb68e9131c2f06504bd91f
tree8d60797023cdbe20af5113882323a390c69ca60c
parent195f6fe37ef8521dbf7dde5ff4a834137990b5b4
parent7feac02414335e1033266f7de1c4d51ffda13b31
Merge branch 'MDL-61951-master' of git://github.com/sarjona/moodle