Merge branch 'MDL-60077-master-fix' of https://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 06:55:50 +0000 (14:55 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 06:55:50 +0000 (14:55 +0800)
commit91f841d00fe378aea3d58c1e0e3c8ff224663158
treefd6d18d5ca8118dc7adea121ca049be0791b4dbd
parent258f54501b9e6587fa2814be8f5c656ced190f4b
parent826f61e500e29ccef1497da9d467da422b291f6a
Merge branch 'MDL-60077-master-fix' of https://github.com/andrewnicols/moodle