Merge branch 'MDL-60943-m34' of https://github.com/sammarshallou/moodle into MOODLE_3...
commit41ff45a7a727ee81a244bf003e146004373112d4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 23:52:29 +0000 (9 00:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 23:52:29 +0000 (9 00:52 +0100)
tree282d0bc40a839d23c96fd7080845af083bd0c90d
parentfa4274319d45ba0f3bc3c0df7b3f7adb7ed7a937
parent0ce4a248881a7c3ece6e3dc5ae7140c9dae5daad
Merge branch 'MDL-60943-m34' of https://github.com/sammarshallou/moodle into MOODLE_34_STABLE