Merge branch 'MDL-62344-master-final' of https://github.com/Tsheke/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jul 2018 21:53:52 +0000 (23:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jul 2018 21:53:52 +0000 (23:53 +0200)
commit8c76cf65e8355e85482dafb111b66dfbcbaeba9a
tree9311b4d226d5080143652efdbbdaae35435f58c2
parentc121e849c1838fb37679e3833ce87e3f9f01fd06
parent155bf1dd2f4b47228ee66ddc9ce6172dffb50748
Merge branch 'MDL-62344-master-final' of https://github.com/Tsheke/moodle