Merge branch 'MDL-60815-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 04:27:43 +0000 (12:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 04:27:43 +0000 (12:27 +0800)
commit174fbacc9be44167d134dd50f1b58b434ba91812
tree239ce47241b768b3ade7078e9bb151f5b7c84403
parent5705fd0907e7d01563b34c3e59ed0385af37c698
parentbb8bb8e41cea2216cfdd28bf353d413cb60a4428
Merge branch 'MDL-60815-master' of git://github.com/ryanwyllie/moodle