diff options
author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-07-07 00:23:42 +0000 |
---|---|---|
committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-07-07 00:23:42 +0000 |
commit | 65ef1cb72a7d93dc2d031e0d9766ed1fb5c27edc (patch) | |
tree | 5af8feda638b0d7b0ef2d6cb04ec271162970288 /lib/router.php | |
parent | acb305b34a5ff1dcd6f90eeb93ea2634dc77863e (diff) | |
parent | 4fffe1874f7db6239a42d5a9acdc4279fdde08f8 (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'lib/router.php')
-rw-r--r-- | lib/router.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/router.php b/lib/router.php index 50b733453..75e72f932 100644 --- a/lib/router.php +++ b/lib/router.php @@ -261,7 +261,7 @@ class Router $m->connect('api/statuses/:method', array('action' => 'api', 'apiaction' => 'statuses'), - array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|friends|followers|featured)(\.(atom|rss|xml|json))?')); + array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?')); $m->connect('api/statuses/:method/:argument', array('action' => 'api', |