Merge branch 'wip-MDL-59736-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 10:10:36 +0000 (12:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 10:10:36 +0000 (12:10 +0200)
commit0982255fa8037fc5bfdededa3332a88d0ec39f80
treec50cdc905fccb34d819adc059974958746c6cbc6
parent104ae3efdf5970c6e851143e6e9f7d986e705a1f
parent8f725c12e8cbd6dff663337bed9150840310b275
Merge branch 'wip-MDL-59736-master' of git://github.com/marinaglancy/moodle