Merge branch 'MDL-57968-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 00:57:13 +0000 (08:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 00:57:13 +0000 (08:57 +0800)
commitb885f0bf6018920a27f4ed9b09e02011b59b3672
tree3172a29508948e0f5c007e73f03747c107e83116
parent9e7c3978895c7cab585c2f5234ca536151d3bef6
parent84e03ed859f557e825ed4dc5838869cea5d6e8c2
Merge branch 'MDL-57968-master' of git://github.com/cescobedo/moodle