Merge branch 'MDL-68526-master' of git://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2020 15:14:12 +0000 (17:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2020 15:14:12 +0000 (17:14 +0200)
commit6462724e4f8492e0b0b85e08c5261f0b07592b52
treec3fd66bb002b46792e3fe85e596f8d362a3ba2b8
parent8060ed34dbbc8622b9a59fddcd922894eca7ba24
parent01003725f4e067c1ddf28759f8427b993227bc3f
Merge branch 'MDL-68526-master' of git://github.com/aanabit/moodle
contentbank/classes/contenttype.php
contentbank/tests/contenttype_test.php