Merge branch 'MDL-68253-master' of git://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Mon, 18 May 2020 11:54:34 +0000 (13:54 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 18 May 2020 11:54:34 +0000 (13:54 +0200)
commit20a18525938cd126434338859327efa71260a139
tree07a0a37c0e7d1ffb01e27bea0726f1760a827f35
parent84ab8a51e21c9809845480bf17fc2ed41af3b78c
parentee4abdc11dabe0e148a195ff0853ee27f82d850f
Merge branch 'MDL-68253-master' of git://github.com/lucaboesch/moodle