Merge branch 'MDL-63628-master' of git://github.com/damyon/moodle
authorSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 11:19:41 +0000 (12:19 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 11:19:41 +0000 (12:19 +0100)
commit7d4a9008fa23aaa0d12d1e86642720e38b0e80a3
tree96a67bdcb945ad418aacb5d57f05c8140eeb5fb5
parent1daf9e60ac55d0af0b299727f98310cc2fe99cc4
parent2fbd00cb2223584869f247914afe5746a092f0d8
Merge branch 'MDL-63628-master' of git://github.com/damyon/moodle