diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-12 11:56:23 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-12 11:56:23 -0400 |
| commit | b3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (patch) | |
| tree | 76666150701f03205bfff77e7d034dfa724f8764 /actions/api.php | |
| parent | 399669b1fb955d2d8c18098a7b551184d534a94c (diff) | |
| parent | e185c0395a6cd250ccd7c8e385c54830be73f937 (diff) | |
Merge branch '0.7.x' into 0.8.x
Conflicts:
classes/Notice.php
lib/action.php
lib/router.php
lib/twitter.php
Diffstat (limited to 'actions/api.php')
| -rw-r--r-- | actions/api.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actions/api.php b/actions/api.php index a27d24492..c18d551b6 100644 --- a/actions/api.php +++ b/actions/api.php @@ -127,7 +127,9 @@ class ApiAction extends Action 'laconica/wadl'); static $bareauth = array('statuses/user_timeline', + 'statuses/friends_timeline', 'statuses/friends', + 'statuses/replies', 'statuses/followers', 'favorites/favorites'); |