Merge branch 'MDL-59294-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:42:41 +0000 (09:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:42:41 +0000 (09:42 +0200)
commita590ff736c6cb980c382861998def9f197051917
tree35bb6e515417bc8407d40e459c15dfc3a02508f7
parent9a334cb44456cf5bb5fd38b2fc28f261f40218b0
parent56249d8710a55487e3b26335a705bd1e0d254497
Merge branch 'MDL-59294-master' of git://github.com/junpataleta/moodle