Merge branch 'MDL-62834-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 02:44:51 +0000 (10:44 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 02:44:51 +0000 (10:44 +0800)
commit7eb7e4b9ea02be35dda18af219d69a6643a41d66
tree24fd475e34a17d459af45927b6d4275ae09ab509
parentab044c6cd595c4af68f3fb06a5a2f807b7ee5913
parent481548f580ed1e09f64d072a1a6a00dd6ffa5279
Merge branch 'MDL-62834-master' of git://github.com/andrewnicols/moodle