Merge branch 'MDL-68312-master-2' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Jun 2020 00:00:57 +0000 (08:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Jun 2020 00:00:57 +0000 (08:00 +0800)
1  2 
grade/report/grader/lib.php
lib/outputcomponents.php

Simple merge
Simple merge