Merge branch 'MDL-68571-master' of git://github.com/cescobedo/moodle
authorSara Arjona <sara@moodle.com>
Mon, 11 May 2020 14:52:48 +0000 (16:52 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 11 May 2020 14:52:48 +0000 (16:52 +0200)
commit36a3a259de9c95cb4caba42826e49222ceba12aa
tree1b3033481444e81457f49025385450012e437190
parent80fd46edfd0694eada65f3d4e86dfd1258164fe5
parent444b2282f1402aa4b6f3191610c276f104d265b3
Merge branch 'MDL-68571-master' of git://github.com/cescobedo/moodle