diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-01 11:19:20 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-01 11:19:20 -0700 |
| commit | ec8dd014e3d10a05b57549cf4f0e82a630ef6303 (patch) | |
| tree | 2fe1c6cabf7a38e01a7e5bc8605eb39b57b4f175 /lib | |
| parent | aee641ee1e311fb0af0f9f6d75ca7fae2c7d8477 (diff) | |
| parent | b12e72ae312488caf7cb1e1a396eb05dd38326a9 (diff) | |
Merge branch '0.7.x' into querybyid
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 |