Merge branch 'MDL-62007-master' of git://github.com/mihailges/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 4 May 2018 01:19:51 +0000 (09:19 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 4 May 2018 01:19:51 +0000 (09:19 +0800)
commit4fb76c0faccb5e13111e33c99368610529d72fd0
treefc42add5de005bc53a371e6aaeb1303ab89f9bbc
parent67e2ee0b655aa50277b063f0ca5fdd572edb82b4
parent8ddb08c9d9ac8e50c6e879740d5e4918511f1079
Merge branch 'MDL-62007-master' of git://github.com/mihailges/moodle