Merge branch 'MDL-66553' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 14 Oct 2019 01:42:03 +0000 (09:42 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 14 Oct 2019 01:42:03 +0000 (09:42 +0800)
1  2 
config-dist.php
question/category_class.php

diff --cc config-dist.php
Simple merge
Simple merge