Merge branch 'MDL-68098-310' of git://github.com/dpalou/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Thu, 1 Oct 2020 10:56:23 +0000 (12:56 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 1 Oct 2020 10:56:23 +0000 (12:56 +0200)
1  2 
calendar/lib.php
course/externallib.php

Simple merge
Simple merge