Merge branch 'MDL-58713-master-fix' of git://github.com/junpataleta/moodle
commitf66ab6e4f7a1142aede4c30b9f31b1d198629ed0
authorJake Dallimore <jake@moodle.com>
Tue, 17 Oct 2017 01:50:49 +0000 (17 09:50 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 17 Oct 2017 01:50:49 +0000 (17 09:50 +0800)
tree685819ca44f13166b81afbf8103339252384d137
parent4f53f3f57135549fd0c848ef2785270f10b9efba
parent52f6f4879ac58723f7fe9a6222a9780ec10c447c
Merge branch 'MDL-58713-master-fix' of git://github.com/junpataleta/moodle