Merge branch 'MDL-68098-master' of git://github.com/dpalou/moodle into master

author Sara Arjona <sara@moodle.com>

Thu, 1 Oct 2020 10:56:16 +0000 (12:56 +0200)

committer Sara Arjona <sara@moodle.com>

Thu, 1 Oct 2020 10:56:16 +0000 (12:56 +0200)
author Sara Arjona <sara@moodle.com>
Thu, 1 Oct 2020 10:56:16 +0000 (12:56 +0200)
committer Sara Arjona <sara@moodle.com>
Thu, 1 Oct 2020 10:56:16 +0000 (12:56 +0200)
diff --cc calendar/lib.php
Simple merge
diff --cc course/externallib.php
Simple merge
author	Sara Arjona <sara@moodle.com>
	Thu, 1 Oct 2020 10:56:16 +0000 (12:56 +0200)
committer	Sara Arjona <sara@moodle.com>
	Thu, 1 Oct 2020 10:56:16 +0000 (12:56 +0200)
		1	2
calendar/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
course/externallib.php	patch \|	diff1 \|	diff2 \|	blob \| history