Merge branch 'MDL-59242-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Oct 2017 20:59:38 +0000 (22:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Oct 2017 20:59:38 +0000 (22:59 +0200)
commit3255109721d7183a254207d42564c66c2f3278d6
treea0d89f53a2841ca91595c298a6d62d7c03cd7f8a
parent1a6aa52e0fbd14be70a8cdeda223742c3a6a2af6
parent6e2f4866b0b6e85c18d1673793f2f6d42cff824a
Merge branch 'MDL-59242-master' of git://github.com/jleyva/moodle