Merge branch 'MDL-59671-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 03:46:51 +0000 (11:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 03:46:51 +0000 (11:46 +0800)
commitf4cc24ca648909b97e2083c151b6932d7c0a378b
tree628fe27ec477187927d146eabe0da02efe316450
parent9eebb3c38b1e39b624d83ebcf5084747bfb0a9aa
parentc34e2002419bd83ae48ef35f18402749ccdbd9f4
Merge branch 'MDL-59671-master' of git://github.com/lameze/moodle