Merge branch 'MDL-67680-master' of git://github.com/marinaglancy/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 22 Jan 2020 02:28:23 +0000 (10:28 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 22 Jan 2020 02:28:23 +0000 (10:28 +0800)
1  2 
lib/setup.php

diff --cc lib/setup.php
Simple merge