| commit | 90e64ecb4ee6af9c8c797f3f00bb386ecef89f29 | |
| author | Tim Hunt <T.J.Hunt@open.ac.uk> | |
| Fri, 10 Feb 2012 15:14:51 +0000 (10 15:14 +0000) | ||
| committer | Tim Hunt <T.J.Hunt@open.ac.uk> | |
| Fri, 10 Feb 2012 15:14:51 +0000 (10 15:14 +0000) | ||
| tree | 2af6cb5c5fcb6c6e913d7a0459289429d9d9598a | treesnapshot (tar.gz zip) |
| parent | 8f042b51590761ca020173a19cf6fa0fd1a31e4d | commitdiff |
| parent | 12d0d76b900725ea94b853608e49b59e2c228bb3 | commitdiff |
MDL-47494 ddwtos: Merge branch 'MOODLE_21_STABLE'
Conflicts:
lang/en/qtype_ddwtos.php
version.php
Conflicts:
lang/en/qtype_ddwtos.php
version.php
| question/type/ddwtos/README.txt | diff1 | diff2 | blobhistory |
| question/type/ddwtos/lang/en/qtype_ddwtos.php | diff1 | diff2 | blobhistory |
| question/type/ddwtos/version.php | diff1 | diff2 | blobhistory |