Merge branch 'MDL-44859-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 10:06:48 +0000 (12:06 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 10:06:48 +0000 (12:06 +0200)
commitc85a3823b8dbddc37964e8e5626269da8e343ffc
tree2764648676b7df661b1815a1873d1bd4a40dff1b
parentec4d05c6b67516e6307dd61aca8e066bcc2fbc03
parentdf24fb71722c780ab2eda4cf59cafa0a42295b87
Merge branch 'MDL-44859-master' of https://github.com/lucaboesch/moodle