Merge branch 'MDL-61703-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:31:11 +0000 (00:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:31:11 +0000 (00:31 +0200)
commitf9ee170a9b1fb7e73b0533484c1966f3f5444fc6
tree1773f172ec8b0ea103ef5334f59c888305750d5a
parentdfbcdb3ec2b704844824045fc87af95e9d8238a6
parent3fb9ad0ea7d4714b6bd2db124740388fd83c7e9a
Merge branch 'MDL-61703-master' of git://github.com/andrewnicols/moodle