Merge branch 'MDL-69257-master' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 9 Oct 2020 03:12:23 +0000 (11:12 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 9 Oct 2020 03:12:23 +0000 (11:12 +0800)
1  2 
h5p/ajax.php

diff --cc h5p/ajax.php
Simple merge