Merge branch 'MDL-60838-m34' of https://github.com/sammarshallou/moodle into MOODLE_3...
commit7974bbcaf7096df4ad76ae7e11e2f6651ff8e529
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 19:48:27 +0000 (28 20:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 19:48:27 +0000 (28 20:48 +0100)
treece692200750e3d5f8da83938e55966de75073391
parent8938d826d9ab5f1b0d9ddf0767fd2dc204a0212c
parent70a804d98e6ace343de0b8cef0b9d960d00e6f1d
Merge branch 'MDL-60838-m34' of https://github.com/sammarshallou/moodle into MOODLE_34_STABLE