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)
1  2 
contentbank/classes/contenttype.php
contentbank/tests/contenttype_test.php

Simple merge