Merge branch 'wip-MDL-60167-32' of git://github.com/marinaglancy/moodle into MOODLE_3...
commit0c95cbef53050fc259ee5d3ed792ba956e2b3745
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 18:19:50 +0000 (25 20:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 18:19:50 +0000 (25 20:19 +0200)
tree3096bae273cdebcb4c82bb28ac939b390b26e1b5
parent469c46aa3ae07da898bde4611867e2be228d558c
parent930ef87ff809ed019a5fbd0ebc810f6e8f0317e8
Merge branch 'wip-MDL-60167-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE