Merge branch 'MDL-62394-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 06:23:41 +0000 (14:23 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 06:23:41 +0000 (14:23 +0800)
commit0697a5221827c0d3f5e227047001a86711270808
tree34c1b1e709077d643a16b597b1b063a6b7b41cff
parent44d89dfa7a933796f06d195ef0d703691a625612
parent20f3b33b247691c3bf217f1c6eb5b0fe48a15d3a
Merge branch 'MDL-62394-master' of git://github.com/andrewnicols/moodle