Merge branch 'MDL-58286-master' of https://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:39:21 +0000 (09:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:39:21 +0000 (09:39 +0200)
commit9a334cb44456cf5bb5fd38b2fc28f261f40218b0
treebf1a4b5aa14aa4bf8cbd01b0f6016b8189c74c5f
parent29dcef0b658ba5e081f0357c33d942af9eb67f37
parentd349b0f0f8a1406d051bb39206deab8a8aff2b9e
Merge branch 'MDL-58286-master' of https://github.com/xow/moodle