Merge branch 'MDL-69270-master' of git://github.com/ferranrecio/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 05:00:08 +0000 (13:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 23:26:02 +0000 (07:26 +0800)
commit805cca26fdbf850c4e0c400c93b980eb6629db1b
treeecdc1cb9fb23a661066f94e2582d1de7ac2257b3
parente1f374611257ff22982d38fa8a69321c80db62e8
parentc5a8469abb09056350f60f3f9f423db986361902
Merge branch 'MDL-69270-master' of git://github.com/ferranrecio/moodle
contentbank/classes/contenttype.php
contentbank/tests/contenttype_test.php
contentbank/view.php
lang/en/contentbank.php