Merge branch 'MDL-69050-310-allowlist' of git://github.com/mudrd8mz/moodle into MOODL...
authorSara Arjona <sara@moodle.com>
Thu, 1 Oct 2020 12:51:12 +0000 (14:51 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 1 Oct 2020 12:51:12 +0000 (14:51 +0200)
1  2 
calendar/lib.php
lib/externallib.php
question/type/essay/question.php

Simple merge
Simple merge
Simple merge