Merge branch 'MDL-60317' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Oct 2017 06:05:57 +0000 (14:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Oct 2017 06:05:57 +0000 (14:05 +0800)
commit7da1dd651a5b2390b8fee6ed70a680339709864d
tree8a5aad8d2c90e885e42ef4c05554e4b500cd4fc1
parentf3500bda4e99316eeb480c23a18395b29ccc9a5d
parent32250b88369532e6de3a923f57851a5987ead764
Merge branch 'MDL-60317' of git://github.com/timhunt/moodle