Merge branch 'MDL-63755-master' of git://github.com/andrewnicols/moodle
commit1524c4d66c937fdd9595f31839f69e82ff7eb713
authorDamyon Wiese <damyon@moodle.com>
Thu, 25 Oct 2018 00:36:49 +0000 (25 08:36 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 25 Oct 2018 00:36:49 +0000 (25 08:36 +0800)
tree622934d46d6a26864d38b557fdcda5a8e36a87d4
parent980ed5424d6c9103fa1eef281e2a81b0b4416302
parentc7120f78058ff49c60f8383094a2167d60e89c4c
Merge branch 'MDL-63755-master' of git://github.com/andrewnicols/moodle