Merge branch 'MDL-62535-master-fix' of github.com:abgreeve/moodle
commit6950592fcd41a8b0c243e88de847c1d329c10fac
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 30 Aug 2018 05:49:15 +0000 (30 13:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 30 Aug 2018 05:49:15 +0000 (30 13:49 +0800)
treebd4303845ff00c107ccfa5240cb1be8a3da4d887
parentcf76059eda1235ddefe5545be9c6b5fcbb275a35
parentdfc5e6d10ec47c59f10c89a56d0a342a1c307a5a
Merge branch 'MDL-62535-master-fix' of github.com:abgreeve/moodle