Merge branch 'MDL-42752-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Jul 2014 15:06:13 +0000 (16:06 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Jul 2014 15:06:13 +0000 (16:06 +0100)
commitc5afe577c9ec8a735964222a13511a708bd0231e
tree193cb917fbfaab4652dfcafee3e565811a44e56a
parentffd17daf0a438fa63a32d3c1ba08218e16def46c
parenta34f0a4331f9c0212a54285d628404cd2f444baa
Merge branch 'MDL-42752-master' of git://github.com/phalacee/moodle
repository/filepicker.js