Merge branch 'MDL-60953-master' of https://github.com/timhunt/moodle
commit9dbb24fa7a262631a8d96e44496b011869e6047f
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 09:43:53 +0000 (16 11:43 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 09:43:53 +0000 (16 11:43 +0200)
treeca376d818a0ce4e799df89bf1043ad4ed3505bb8
parentd2c80085fd68673a1aae10dbe769426c61fab6ce
parent3c49b0e6b633d3e644b0255879a2329e333d8b96
Merge branch 'MDL-60953-master' of https://github.com/timhunt/moodle