| commit | 18ccaca2e2d125ab084a5f8a40ed222ecbd1d752 | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 24 Sep 2013 21:13:50 +0000 (24 23:13 +0200) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 24 Sep 2013 21:13:50 +0000 (24 23:13 +0200) | ||
| tree | 3a99af470f4c5111717be27201470a80e67b1d94 | treesnapshot (tar.gz zip) |
| parent | 394372b7da258b09b6ceb09352cd198b24cb13f0 | commitdiff |
| parent | 11b0c8e0e62750b0c6d4f26448140dc02812577b | commitdiff |
Merge branch 'MDL-41726-master-2nd' of git://github.com/FMCorz/moodle
Conflicts:
lang/en/moodle.php
Conflicts:
lang/en/moodle.php
| lang/en/moodle.php | diff1 | diff2 | blobhistory |
| lib/moodlelib.php | diff1 | diff2 | blobhistory |
| mod/quiz/locallib.php | diff1 | diff2 | blobhistory |