Merge branch 'MDL-60766-master' of git://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 10 Nov 2017 04:02:41 +0000 (17:02 +1300)
committerJun Pataleta <jun@moodle.com>
Fri, 10 Nov 2017 04:02:41 +0000 (17:02 +1300)
commitcfbc820e1bd6be7a5bd1893bd34d22a8cee23803
tree61819155accdba5a49b29c7bd5b766eb997f42f3
parent6e2d8c121bc8c65206976fa00fab2bc2bfe1dac4
parent08b7558483af4440100f2f97c90afa23c84dc662
Merge branch 'MDL-60766-master' of git://github.com/ryanwyllie/moodle