Merge branch 'MDL-58454-master-fix' of git://github.com/junpataleta/moodle
commit1c7288e79b19b03f1e9b7cde28d92a7ca6d015e9
authorDamyon Wiese <damyon@moodle.com>
Tue, 6 Nov 2018 08:45:48 +0000 (6 16:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Nov 2018 14:48:31 +0000 (6 15:48 +0100)
tree5ec1d06c37549f5f00ff2b8e111afa6595eb30d4
parent6d47156f75c5ac5fc2cc3ab0d4cb147c859cb925
parente75860caea1d3122281f1600474f5f1981b6e728
Merge branch 'MDL-58454-master-fix' of git://github.com/junpataleta/moodle