Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 14 Jun 2012 09:08:18 +0000 (17:08 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 14 Jun 2012 09:08:18 +0000 (17:08 +0800)
commit60d3ff94db722dd026343a1305f21b39acf2e3d3
tree4bafa72509cab38af632e4288f6d9e5b2b584792
parentd4401b964328016c4d11fe2c2c1ef6c94341b022
parent98d5bad9faa6edd67b4f1ac01a92c314667871f9
Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle
lib/form/filemanager.js