Merge branch 'MDL-59250-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 16:34:56 +0000 (18:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 16:34:56 +0000 (18:34 +0200)
commit365665dbad3ad1a5133951e51f56d14edd87f573
tree298992d19b9f8af8f2305763fcc6025af9c91921
parent4fce2a24ee050d759c1e8398c858e5a7940a8f82
parentfe966a27208e2f229c41592342e67d2e1c601b4f
Merge branch 'MDL-59250-master' of git://github.com/jleyva/moodle