Merge branch 'MDL-61584' of git://github.com/jrchamp/moodle
commit0f5e1baf4c6c5d71c3d1f436e82eeead938606b6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2018 23:46:09 +0000 (14 00:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2018 23:46:09 +0000 (14 00:46 +0100)
tree9e6b22040ce98e5de629ab81c2ae15bc0f26cde3
parent6cc9dce202253e7142c090ce028ab4346067a048
parent9651175f70f766b7f3bbfe8e2afe4041a97616ed
Merge branch 'MDL-61584' of git://github.com/jrchamp/moodle