Merge branch 'MDL-59982_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 04:21:39 +0000 (12:21 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 04:21:39 +0000 (12:21 +0800)
commitae348e78a0874c52783b25c23bc4c65dbe05ece4
tree6c700bcc3b8c831a59175177a391b5caff6d00e6
parent71fc06aae5e1aa856ef65328784a18abe23be42a
parent9a428ae0121d8b6582d7c9f14ac119f812ab5597
Merge branch 'MDL-59982_master' of git://github.com/markn86/moodle