Merge branch 'MDL-46778-master' of git://github.com/odeialba/moodle
authorSara Arjona <sara@moodle.com>
Mon, 6 Sep 2021 08:03:07 +0000 (10:03 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 6 Sep 2021 08:03:07 +0000 (10:03 +0200)
1  2 
lib/setup.php

diff --cc lib/setup.php
Simple merge