Merge branch 'MDL-62014-master' of git://github.com/nashtechdev01/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 22:57:21 +0000 (00:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 22:57:21 +0000 (00:57 +0200)
commitb7dcb575d2204e3b3f52af45d63f935caeed6dca
tree46c14f663bd97ba4482b898847122d768bb1da6a
parent61a9f8d147a3a3599274096709400a43167787fc
parentd2d82a9d7da517e8dcffdb02e2b295657d32fafc
Merge branch 'MDL-62014-master' of git://github.com/nashtechdev01/moodle