diff options
| author | foockinho <foockinho@lorea.org> | 2012-11-01 03:16:02 +0100 |
|---|---|---|
| committer | foockinho <foockinho@lorea.org> | 2012-11-01 03:16:02 +0100 |
| commit | 57915e6d7471ce7545b2adf70974cb921c0ab3ac (patch) | |
| tree | 946f78e02b4ef12e4cd19444f58ae40d25ae5eac /languages/en.php | |
| parent | 55ca743ea61105b7ec8985e9d8dc29e2f57f092d (diff) | |
| parent | 74895a430a7eb9a31f0555eae29e098608bdf049 (diff) | |
| download | saravea_theme-57915e6d7471ce7545b2adf70974cb921c0ab3ac.tar.gz saravea_theme-57915e6d7471ce7545b2adf70974cb921c0ab3ac.tar.bz2 | |
Merge branch 'master' of gitorious.org:lorea/n1_theme
Conflicts:
_graphics/elgg_sprites.png
Diffstat (limited to 'languages/en.php')
0 files changed, 0 insertions, 0 deletions