Merge branch 'MDL-60741' of git://github.com/timhunt/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 14 Nov 2017 07:28:06 +0000 (15:28 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 14 Nov 2017 07:28:06 +0000 (15:28 +0800)
commit55b2742724009c8725cd410658645f64314612a8
tree8556f6e347eaebd22b1a83adfe2a36cc7e09342b
parent592c216520b41467d23eac7148ae576c818d5135
parentd00007bc4590c86c35e147125599a5e9171de913
Merge branch 'MDL-60741' of git://github.com/timhunt/moodle