Merge branch 'wip-MDL-59125-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jun 2017 19:45:38 +0000 (21:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jun 2017 19:45:38 +0000 (21:45 +0200)
commit2eb67fdc8834b5c289c1160922a37bf69b75ed2b
treeaea957394f46b09bbbf1164bd08034844b9823b6
parent9ee6de43895f69264c029e6fdf67c14acea0f28a
parent450d15d159a2c13d860ca9ffcd9c0df6f74e7119
Merge branch 'wip-MDL-59125-master' of git://github.com/marinaglancy/moodle