Merge branch 'MDL-64151-master-fix' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Apr 2019 10:21:38 +0000 (12:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Apr 2019 10:21:38 +0000 (12:21 +0200)
commit439af892b18dd841da75a47288fd4245925ef799
tree0ea720b0d65b66f6d223178afc9ddd5cc7e81d18
parent5b0aa01faea31993f979a067f3ef06b256f706c5
parent3340758b980648ac724432bac0f3c5d6634cf532
Merge branch 'MDL-64151-master-fix' of https://github.com/marinaglancy/moodle