Merge branch 'MDL-61751-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:23:44 +0000 (00:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:23:44 +0000 (00:23 +0200)
commitdfbcdb3ec2b704844824045fc87af95e9d8238a6
tree9b5f90bc64d8b88c01f7ea072949dd81c83a84e8
parenteed3d30194acf718de80942f417d60db4c1ac899
parent6fb1fd31837d6109e4b0b9417ea72254920f8d6b
Merge branch 'MDL-61751-master' of git://github.com/andrewnicols/moodle