Merge branch 'MDL-61766-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 23:18:20 +0000 (01:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 23:18:20 +0000 (01:18 +0200)
commitf6873c2e31ba964791e913abb6d52b5ea7462bc2
tree8b6fef8123d1ca88634a53f4eb67fdeab63efd43
parent5db00dc3c98fad28d300aa2bb9a8d376fed406d1
parenta2e7a47a6ead069ef0c1c3a5face140879341eb8
Merge branch 'MDL-61766-master' of git://github.com/junpataleta/moodle