| commit | 522b5faf606706e2788d1fdcff2a761ec62c715a | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 13 May 2013 10:07:55 +0000 (13 12:07 +0200) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 13 May 2013 10:07:55 +0000 (13 12:07 +0200) | ||
| tree | d624fc85ea08efa3f6d35c7d92838927a285dc2e | treesnapshot (tar.gz zip) |
| parent | e1559b58e89780b5e9b79385792c3ea49443555d | commitdiff |
| parent | 9f3e0968993a085ca04caa5b0f3bfb249ccb66ef | commitdiff |
Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
lang/en/badges.php
Conflicts:
lang/en/badges.php
| lang/en/badges.php | diff1 | diff2 | blobhistory |