summaryrefslogtreecommitdiff
path: root/actions/api.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-07-13 14:58:39 -0400
committerCraig Andrews <candrews@integralblue.com>2009-07-13 14:58:39 -0400
commite047ba52c7c3f5953336d46fd22715d880002720 (patch)
treeedc29593a7a96e89cd7bd6d2b0b413bc4244fc77 /actions/api.php
parent678f054bfe51e74e26a992ae7de84b73ea95baee (diff)
parent91324890ae130a6f4280c9f6d82151793611de1f (diff)
Merge branch 'tags-timeline-api' into 0.8.x
Diffstat (limited to 'actions/api.php')
-rw-r--r--actions/api.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/actions/api.php b/actions/api.php
index 4a00b77e8..452ed8e82 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -128,6 +128,7 @@ class ApiAction extends Action
'laconica/version',
'laconica/config',
'laconica/wadl',
+ 'tags/timeline',
'groups/timeline');
static $bareauth = array('statuses/user_timeline',