Sam Hemelryk 52ebfade63 Merge branch 'MDL-34607-master' of git://github.com/FMCorz/moodle ...

Conflicts:
	lib/db/upgrade.php
	version.php

2012-09-25 09:51:28 +12:00

..

tests

MDL-35479 fix zip packer tests to use debugging asserts

2012-09-17 12:00:02 +02:00

file_archive.php

…

file_exceptions.php

…

file_packer.php

…

file_storage.php

Merge branch 'MDL-34607-master' of git://github.com/FMCorz/moodle

2012-09-25 09:51:28 +12:00

stored_file.php

…

zip_archive.php

…

zip_packer.php

…