diff options
author | Simon Schampijer <simon@schampijer.de> | 2007-09-01 09:11:36 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2007-09-01 09:11:36 (GMT) |
commit | 6ae5e4111a76f9cb8f59ae6dfc9123365df39467 (patch) | |
tree | ad8f96e324175591b9122980d87db95535d93637 /activity/activity.info | |
parent | 67ef2bd8e5d9beab0f5dcf0a54567590350ad26c (diff) | |
parent | 632354861696311d758b35e8d7c7888b47a2f7b4 (diff) |
Merge branch 'master' into json
Conflicts:
model.py
webactivity.py
Diffstat (limited to 'activity/activity.info')
-rwxr-xr-x | activity/activity.info | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activity/activity.info b/activity/activity.info index 6f145e6..3faad9d 100755 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Browse -activity_version = 43 +activity_version = 44 service_name = org.laptop.WebActivity icon = activity-web class = webactivity.WebActivity |