diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-06-13 15:11:53 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-06-13 15:11:53 (GMT) |
| commit | 6726081a4fe2c62ab255b76d184c2f083ba4ba6e (patch) | |
| tree | 44e0cc3de1a27f4c41b82a7faf874108fca62172 /activity/activity.info | |
| parent | a40d0d0e901d0fc9d1f71bd6269e85586bd0ef12 (diff) | |
| parent | 6e6d22f5d5d2f28782484f7fbd7a1c87401e9d17 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity
Conflicts:
webtoolbar.py
Diffstat (limited to 'activity/activity.info')
0 files changed, 0 insertions, 0 deletions