diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-27 14:52:35 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-27 14:52:35 -0400 |
| commit | b3bb8943f592de9f6936f35be49a88c641bf6da1 (patch) | |
| tree | befbe8ff6d3c7d1268ecce3696bee5caaa799db7 /lib/router.php | |
| parent | 698228acb9a6262f2fb4e0c82118249aa94cc0f8 (diff) | |
| parent | f59ab5dc40862b141ee5463fd4d24b0d213a96f2 (diff) | |
Merge branch '0.7.x' into utf8
Diffstat (limited to 'lib/router.php')
| -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 |