Merge branch 'MDL-45088-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 01:21:53 +0000 (03:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 01:21:53 +0000 (03:21 +0200)
commitef0a8b99b2902f0379984c0ab1f0d5dd5e40725f
tree28ca55d87ce6acfae3cec690b72f0106f7b80c4a
parent242b8fc0f30072168f712b059f360445e9644c94
parent2846038ed10901298e521bd469eea6093b9f8601
Merge branch 'MDL-45088-master' of https://github.com/lucaboesch/moodle