| commit | 02c6bd358f98404e0ff4f4a99fe0dd5b06f537ad | |
| author | Dan Poltawski <dan@moodle.com> | |
| Thu, 7 Nov 2013 01:34:31 +0000 (7 09:34 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Thu, 7 Nov 2013 01:34:31 +0000 (7 09:34 +0800) | ||
| tree | 3facccb241472c4d42d3c028a37eaea536393750 | treesnapshot (tar.gz zip) |
| parent | e916eb407c2cf85d78d47a84d9783e9761158535 | commitdiff |
| parent | 5a25566060ee3b617d119763b9053c063932b0d1 | commitdiff |
Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
lang/en/moodle.php
Conflicts:
lang/en/moodle.php
| lang/en/admin.php | diff1 | diff2 | blobhistory |
| mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php | diff1 | diff2 | blobhistory |