Merge branch 'MDL-59443-master-filetypesvalidation' of git://github.com/mudrd8mz...
authorDan Poltawski <dan@moodle.com>
Tue, 11 Jul 2017 09:16:40 +0000 (10:16 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Jul 2017 09:16:40 +0000 (10:16 +0100)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge