Sam Hemelryk 46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes

2011-06-13 16:54:52 +08:00

..

delete.php

…

edit_form.php

…

edit.php

…

externallib.php

Merge branch 'MLD-27565-wip' of 'git://github.com/mouneyrac/moodle.git' with changes and conflict resolution for MDL-27565

2011-06-08 10:11:51 +08:00

index.php

…

lib.php

MDL-26105 Block settings should contains less options, and be more user friendly

2011-06-09 13:51:14 +08:00