Merge branch 'wip-MDL-61127-master' of git://github.com/abgreeve/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 3 Apr 2018 09:34:03 +0000 (17:34 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 3 Apr 2018 09:34:03 +0000 (17:34 +0800)
commit166a9cec54bbe5503f9e10e37b09f0d159526cfc
tree123715efe619ec7ca8223463fe7edd0614bfcb8b
parent5a0dd0e50d488c10917ab987afe0127ad7e958aa
parentdcf4254179fde8007e75205221f98057a94cc731
Merge branch 'wip-MDL-61127-master' of git://github.com/abgreeve/moodle