Merge branch 'MDL-65573-master-2' of git://github.com/peterRd/moodle
authorSara Arjona <sara@moodle.com>
Tue, 14 Jan 2020 11:20:00 +0000 (12:20 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 14 Jan 2020 11:20:00 +0000 (12:20 +0100)
commitf6fe70d0758b9c3843d58037c0ac31e59ee88355
tree3b5db6cee53a2ab69db4d31415641249c60b1caa
parent6813b79f81a108a7c24aff13c707632db17c6e53
parent18cd2efd44f0bfb4072fbaf7925d83ca266a6fc0
Merge branch 'MDL-65573-master-2' of git://github.com/peterRd/moodle