Merge branch 'MDL-61772-master' of git://github.com/lameze/moodle
commitc8058231c1e9d865aec6c83ae0b80ad8fd866f21
authorJun Pataleta <jun@moodle.com>
Thu, 19 Apr 2018 08:13:18 +0000 (19 16:13 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Apr 2018 08:13:18 +0000 (19 16:13 +0800)
tree41a9d6ae774fd4fb96a17624faf8707372247b4d
parent53036a68861dfcd8c00129e0f2a8ca7092c06b99
parentc91da28071233cf722e4aff436521d54400f8c31
Merge branch 'MDL-61772-master' of git://github.com/lameze/moodle