diff options
| author | erich koslovsky <erikos@localhost.localdomain> | 2007-08-20 14:17:05 (GMT) |
|---|---|---|
| committer | erich koslovsky <erikos@localhost.localdomain> | 2007-08-20 14:17:05 (GMT) |
| commit | d2ecf45efb44dedf4e5fb002297afe5495a29b8d (patch) | |
| tree | 48fc6fa76afec4cf5b314296f4306212b5255f10 /activity/activity.info | |
| parent | f9166988b59b77c0584f4cd004f27eebc662cad5 (diff) | |
| parent | 61aab39861892f73e211ab477df94eb895bb38ff (diff) | |
Merge branch 'master' of git://dev.laptop.org/web-activity
Removed a few conflicts for the merge.
Conflicts:
po/Web.pot
po/ar.po
po/de.po
po/el.po
po/es.po
po/fr.po
po/mk.po
po/pt.po
po/pt_BR.po
Diffstat (limited to 'activity/activity.info')
0 files changed, 0 insertions, 0 deletions