Merge branch 'wip-MDL-50670-master-fix' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 5 May 2017 06:55:22 +0000 (14:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 5 May 2017 06:55:22 +0000 (14:55 +0800)
commit529d52f39a5d4e9b414b02734db63f653842e4ca
tree1c2e3e948d5dd8db3c85347f15867fbfe2e60246
parent1d116698c71595a23bd70d3d0660871554429f5e
parentaef5c363d0fc70dec5a06ae78b960d961821c443
Merge branch 'wip-MDL-50670-master-fix' of https://github.com/marinaglancy/moodle