Merge branch 'MDL-62357-master' of git://github.com/cescobedo/moodle
commita61cd7efef30aa118638431194cb75db1bd0aba3
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 May 2018 12:43:02 +0000 (14 20:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 May 2018 12:43:02 +0000 (14 20:43 +0800)
tree90c46844dd7d1f8d4577a26b5c475b4a5f01cc3a
parent4557b4e0651f0e9fffb2b2244088ed590c8f050b
parent30f3ea7fe170578f001653ae71e88ece17145abe
Merge branch 'MDL-62357-master' of git://github.com/cescobedo/moodle