Damyon Wiese f0ae8d7a66 Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle ...

Conflicts:
	backup/backup.php
	theme/bootstrapbase/style/moodle.css

2013-10-10 09:31:33 +08:00

..

backup_includes.php

Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle

2013-10-10 09:31:33 +08:00

convert_includes.php

MDL-27379 Backup conversion logging facilities

2011-06-06 13:56:06 +02:00

restore_includes.php

MDL-38196 Backup/restore: Display log if non-empty

2013-10-08 11:00:11 +01:00