Merge branch 'master_MDL-58015' of https://github.com/danmarsden/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Jul 2018 11:36:21 +0000 (13:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Jul 2018 11:36:21 +0000 (13:36 +0200)
commit834ee94fe3333545fbdf0aa6eda69d9e7b3981f7
treed03da85dc1da6daf266a43364b24cc5a78eac5e3
parentf3e240e7e0acaab5a99308a0aa273637d33a6dee
parent7c75e02730a1e55cd5cc1d299ad960f71ebec13a
Merge branch 'master_MDL-58015' of https://github.com/danmarsden/moodle