diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-04-29 12:12:28 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-04-29 12:12:28 -0400 |
| commit | e78342c4844fa935d7e455d669cb2617c6362a4b (patch) | |
| tree | 94a5cb2ffa0a285afe3bdeaa6f12ad491dfb97d1 /lib | |
| parent | a4d959b8a2254d173bdf45f418f6add9f6f62cda (diff) | |
| parent | e85cddba45c2ce02d135f00acdcfa37cb9168130 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/router.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/router.php b/lib/router.php index 6fb2f9487..12590b790 100644 --- a/lib/router.php +++ b/lib/router.php @@ -231,12 +231,12 @@ class Router $m->connect('api/statuses/:method', array('action' => 'api', 'apiaction' => 'statuses'), - array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|friends|followers|featured)(\.(atom|rss|xml|json))?')); + array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|friends|followers|featured)(\.(atom|rss|xml|json))?')); $m->connect('api/statuses/:method/:argument', array('action' => 'api', 'apiaction' => 'statuses'), - array('method' => '(user_timeline|friends_timeline|replies|show|destroy|friends|followers)')); + array('method' => '(user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)')); // users |