Merge branch 'MDL-61998-master' of git://github.com/sarjona/moodle
commit7bff0ee145748eb91252620809a92a9c47dea1db
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 00:39:17 +0000 (26 02:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 00:39:17 +0000 (26 02:39 +0200)
tree7f6abd5f60c784dc21555815b683830be25525fa
parentc8fc9c61a25f019432331ba89db56db51fb141bb
parent5a86bf1448131f4f11da172dd88aae03d403f721
Merge branch 'MDL-61998-master' of git://github.com/sarjona/moodle