Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 14 Jun 2012 08:23:08 +0000 (16:23 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 14 Jun 2012 08:23:08 +0000 (16:23 +0800)
commit4585e6ac9888a502cc8ae4212cf28c717d0e0fce
treeeaf4b2dcdc26a3da0faa3e3f202023c96a58c045
parent70b1d892ed089e7f109ac25dc0230cc78f62218b
parent6fd1cf05b03834f0b9ec84941bb0f1ba383830dc
Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle
lib/filelib.php
lib/form/filemanager.js
repository/equella/lib.php
repository/filesystem/lib.php
repository/lib.php
theme/base/style/filemanager.css