Merge branch 'MDL-62225-master' of https://github.com/lucisgit/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 6 Jun 2018 07:56:38 +0000 (15:56 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:31 +0000 (11:16 +0200)
commit43cc39bbc2a4a5c6052380a75663b481f6c7a737
tree07d3c7778cd19115cc2991e928d62d24c3b9735e
parentd585953dfe55fad9c2f38575bb957514dbb633fc
parent8e642421313ca2f7234a8d47e49a4b8cfbd84530
Merge branch 'MDL-62225-master' of https://github.com/lucisgit/moodle