Merge branch 'MDL-68592-master' of https://github.com/kabalin/moodle
commit968016a38d8816a63430e7ffc3ed1bdd389b05e8
authorSara Arjona <sara@moodle.com>
Fri, 22 May 2020 15:55:23 +0000 (22 17:55 +0200)
committerSara Arjona <sara@moodle.com>
Fri, 22 May 2020 15:55:23 +0000 (22 17:55 +0200)
tree23428a6d82667d13627efd02e41fead2a86dd2a1
parent4955d9279f51b4c323794b8d98bf7c6ae4ed75b2
parent50bf320f4d4ea9c600fbe1b967045337571c9591
Merge branch 'MDL-68592-master' of https://github.com/kabalin/moodle