Merge branch 'MDL-68789-master' of git://github.com/crazyserver/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 May 2020 08:46:25 +0000 (10:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 May 2020 08:46:25 +0000 (10:46 +0200)
1  2 
config-dist.php

diff --cc config-dist.php
Simple merge