Merge branch 'MDL-59663-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 19:03:32 +0000 (21:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 19:03:32 +0000 (21:03 +0200)
commit018b1f3112b0d5d010de5c06b4e2abe248eb98de
tree3700aee758cc38326844520675b7ed0afcfb8621
parent9bd0912ad0b8933a3fb5d7459a6336fd70ed7644
parent3a0e3c34b0eed40ca9a1f66a568d1923a124bd36
Merge branch 'MDL-59663-master' of git://github.com/junpataleta/moodle