diff options
| author | Aleksey Lim <alsroot@activitycentral.org> | 2011-06-21 19:47:08 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@activitycentral.org> | 2011-06-21 19:47:08 (GMT) |
| commit | 52c8b44fd8e32f0748acfbf3871f86a143d769d3 (patch) | |
| tree | ae496781254672a44f2f3298cb003915a199714d /activity.py | |
| parent | d5e508b32ecb3fca87f653dc05e7bcb43e6f5b79 (diff) | |
| parent | 94fa1ed47477f1c4b2bc4bd96325ce388e0bdad0 (diff) | |
Fix merge
Diffstat (limited to 'activity.py')
| -rwxr-xr-x[-rw-r--r--] | activity.py | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/activity.py b/activity.py index 40bde74..40bde74 100644..100755 --- a/activity.py +++ b/activity.py |