Merge branch 'MDL-60945' of https://github.com/NeillM/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:31:16 +0000 (11:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:31:16 +0000 (11:31 +0800)
commit80b6f3b05967890b03742fb866f7e78457b733eb
treedf848b9e1854b9df400e51e1cd419bbc99972c34
parent9244faa3a478bc0c0fdedfda9de43f89d41624b4
parent3acb294828a9d5e3587e73d18f4702ca58b1ccea
Merge branch 'MDL-60945' of https://github.com/NeillM/moodle