Merge branch 'wip-MDL-60594-34' of git://github.com/marinaglancy/moodle into MOODLE_3...
commit4b5ac4ceaea0b2a78df364e371f2b5199cd0a5ca
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 23:46:05 +0000 (19 00:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 23:46:05 +0000 (19 00:46 +0100)
treefe6c090934826b2902c6066ff795c1eed1f885a0
parent8ed193c3ee026f7d7847a14a82099e23bfc676fc
parent6d353a791800eaf4d0f14506bc33d9e443cc9ec7
Merge branch 'wip-MDL-60594-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE