Sam Hemelryk 2a336e2a36 Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle ...

Conflicts:
	backup/util/ui/base_moodleform.class.php

2013-12-04 09:44:25 +13:00

..

cc

…

controller

…

converter

…

moodle2

…

util

Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle

2013-12-04 09:44:25 +13:00

backup.class.php

MDL-42929 backup: keep own version & release updated.

2013-11-17 02:32:43 +01:00

backup.php

…

backupfilesedit_form.php

…

backupfilesedit.php

…

import.php

…

log.php

…

restore.php

…

restorefile_form.php

…

restorefile.php

…

upgrade.txt

…