Merge branch 'wip-MDL-57188-master-2' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Aug 2017 05:13:47 +0000 (13:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Aug 2017 05:13:47 +0000 (13:13 +0800)
commit8fa7961d20baa81d33db260494982ab4a5459cb4
tree30aed7232b6672110680c7d8c47df4586c3bd167
parentd9d1e6cb4dc80d5a6aa8b126aa539338aeec614d
parent9dd0fe18a89dfe42a50b52154973b37c2c3348c8
Merge branch 'wip-MDL-57188-master-2' of git://github.com/marinaglancy/moodle