Merge branch 'MDL-60943-m33' of https://github.com/sammarshallou/moodle into MOODLE_3...
commit7857d77a30c966596f7d5c1284196c5e05fc22c0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 23:52:41 +0000 (9 00:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 23:52:41 +0000 (9 00:52 +0100)
tree1c327ffb7daeb0e3c322eb0b994c230a1b7b6c2d
parent6a8c7fd988c69cbd7b81ae494e5f7e191f9819cf
parentd51a8d2e4039a7380d2c6e47f450d1d15323ae89
Merge branch 'MDL-60943-m33' of https://github.com/sammarshallou/moodle into MOODLE_33_STABLE