Merge branch 'MDL-69270-310' of git://github.com/ferranrecio/moodle into MOODLE_310_S...
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 05:15:03 +0000 (13:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 23:28:27 +0000 (07:28 +0800)
commit10ba6d0aa1eb94093f875cb7a18e3689910b0776
tree56d0f5afdb65694b7c34303cd458e1060768b95e
parenta4f4cbf095912214ac0e45b6739a27297621430b
parent2dab18e681eda4307dde7d06ee30715e490b4513
Merge branch 'MDL-69270-310' of git://github.com/ferranrecio/moodle into MOODLE_310_STABLE
contentbank/classes/contenttype.php
contentbank/tests/contenttype_test.php
contentbank/view.php