Merge branch 'MDL-59544-master-filemanagervalidation' of git://github.com/mudrd8mz...
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Jul 2017 09:17:07 +0000 (11:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Jul 2017 09:17:07 +0000 (11:17 +0200)
1  2 
lib/form/filemanager.php
mod/workshop/lang/en/workshop.php

Simple merge
Simple merge