Merge branch 'master_MDL-60007' of https://github.com/CengageEng/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 2 Nov 2017 00:50:42 +0000 (08:50 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 2 Nov 2017 00:50:42 +0000 (08:50 +0800)
commit216bb33940c8f79e5031663b2ffb999bade69bb4
tree482ada4cee86b427e30a66b96c33d0dc6bd39b93
parent58280ae0b846b2b65784e77dd0d10efba8d81186
parent76f11421a4e418b0e95e5c06bf1d8e428896e440
Merge branch 'master_MDL-60007' of https://github.com/CengageEng/moodle