Merge branch 'MDL-62620' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 12:28:15 +0000 (14:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 12:28:15 +0000 (14:28 +0200)
commite812df2260de530981e73c7075123a18ac5f77c9
tree8ca0d8c8e58791161d8fa02709f1a344117786b3
parent995457b8cfde7b9c74d41641a9604038714929bf
parent9a89adcb9810b33a04bf7489e15b4fa89a3dcfdc
Merge branch 'MDL-62620' of git://github.com/stronk7/moodle