Merge branch 'MDL-58634-master' of git://github.com/bmbrands/moodle
commit5da250d027bd290a70f2f04de8daaadedbe4cc50
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 12:36:01 +0000 (11 14:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 12:36:01 +0000 (11 14:36 +0200)
tree0c4a3e0ebf38495ff91a7e24bbbf9d5482815325
parent3d8c0fb776e26340cbb9d491d364ed8996120013
parent0ab6c0d54603b7d60595b8f1aaeb8f97242d1842
Merge branch 'MDL-58634-master' of git://github.com/bmbrands/moodle