Merge branch 'MDL-62386-master' of git://github.com/bmbrands/moodle
commit4396a8f241ccb9e6d45cd38c07d29fbd5d121b22
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 May 2018 01:10:50 +0000 (21 09:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 May 2018 01:10:50 +0000 (21 09:10 +0800)
treea7685fcca7e2d6dde621b52dc0e05c6ccd65b053
parent22744b745bb456f525e8ef09e1fb719a69fc2570
parent881098f39cca65117d9348af2419534352a8b34a
Merge branch 'MDL-62386-master' of git://github.com/bmbrands/moodle