Merge branch 'MDL-31642_dndupload_filemanager_notification_text' of git://github...
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 00:31:08 +0000 (13:31 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 00:31:08 +0000 (13:31 +1300)
commit36d1d23179cb43f58f0fa16d1bde46ce7fbf6a41
tree09ca1ffa6677a2387e704306f76480e954373e35
parent9b0e5e9d0d33c84696ccfc634c435af1633318ca
parentadce023069ddb110e1fb971f5151de665b6ed764
Merge branch 'MDL-31642_dndupload_filemanager_notification_text' of git://github.com/davosmith/moodle
lib/form/dndupload.js
lib/form/filemanager.js