Merge branch 'MDL-31973-master-6' of git://git.luns.net.uk/moodle

Conflicts:
	lib/db/upgrade.php
This commit is contained in:
Eloy Lafuente (stronk7) 2012-08-29 00:42:43 +02:00
commit 238f7761af
14 changed files with 161 additions and 7 deletions

View file

@ -515,3 +515,7 @@ function page_dndupload_handle($uploadinfo) {
return page_add_instance($data, null);
}
function mod_page_allow_group_member_remove($itemid, $groupid, $userid) {
return true;
}