Merge branch 'MDL-62919-master' of git://github.com/cescobedo/moodle
commitf7497ace8a1a6e160c17e63cb1c2217fa46ed7b9
authorJun Pataleta <jun@moodle.com>
Tue, 24 Jul 2018 08:24:39 +0000 (24 16:24 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 24 Jul 2018 08:24:39 +0000 (24 16:24 +0800)
tree3dc08015b0fde73df13f130e83ddd8120c7065dd
parent07249cbb3ac5bc50ada9f3b32e37e3dfaa95f8df
parent9de1a91532b8ebd0a7358c67d7ca7297846bab64
Merge branch 'MDL-62919-master' of git://github.com/cescobedo/moodle