summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-03-03 16:27:19 -0500
committerSarven Capadisli <csarven@status.net>2010-03-03 16:27:19 -0500
commit2a96d1d59deece52f7ab27c0ca6c1bfca3d4c322 (patch)
tree98fc1949cbeb08d710628c3d4d304b7c39fc3536 /actions
parent219e15ac64b0ceefcd714af27b9bbb53123dbe71 (diff)
parent43de781e43d54e1b80f15f0a5d6568e1f2ab86ac (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions')
-rw-r--r--actions/apitimelinegroup.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index d0af49844..e30a08fb5 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -140,7 +140,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
// @todo set all this Atom junk up inside the feed class
- $atom->setId($id);
+ #$atom->setId($id);
$atom->setTitle($title);
$atom->setSubtitle($subtitle);
$atom->setLogo($logo);