Merge branch 'MDL-60767-master-3' of https://github.com/snake/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 19 Dec 2017 03:12:47 +0000 (11:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 19 Dec 2017 03:12:47 +0000 (11:12 +0800)
commit5fe6205813e673bb59257438adaf5d4893fc6f35
tree00edbcb97de7e2444d62883b319f699a5d3b5ddc
parentb260dec8b7ece6b99f6ccc29ab01b453b4568c7e
parentcf26b6f8249301ad4851646f84b479c4bfc2b7c4
Merge branch 'MDL-60767-master-3' of https://github.com/snake/moodle