Merge branch 'MDL-60809-master' of git://git.cameron1729.xyz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:29:53 +0000 (15:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:29:53 +0000 (15:29 +0800)
commitf1c9b8de4748d6da989ee177af7db6a2170fef9a
tree94c213cdd642cc68f485c6759307eeddd033ff3b
parente5902279220cee0ed02fc2a12f7aa38f5ea65735
parentd3e980c4ea309527801595cf87dcf697e16b9754
Merge branch 'MDL-60809-master' of git://git.cameron1729.xyz/moodle