Merge branch 'MDL-61055-master-v2' of git://github.com/lameze/moodle
commit708be473d6469f98ba7351d7bd8dcc95496d1ea2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Dec 2017 23:44:08 +0000 (26 00:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Dec 2017 23:44:08 +0000 (26 00:44 +0100)
tree88c8e703853231037df2d3fc1c9520587df905c9
parentd048e94dfea5828a446adcfe9bc014ba112f229f
parent39cda4059022f417336b8488545fb3d5714be876
Merge branch 'MDL-61055-master-v2' of git://github.com/lameze/moodle