Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 9 insertions, 9 deletions

diff --git a/doc/api_functions.bb b/doc/api_functions.bb
index c9d90c716..e6cde3dc6 100644
--- a/doc/api_functions.bb
+++ b/doc/api_functions.bb
@@ -28,26 +28,26 @@ Twitter API compatible functions:
     api/statuses/mentions T,S,F,(R)

     api/statuses/replies T,S,F,(R)

     api/statuses/user_timeline T,S,F,(R)

-    api/favorites T,S,F,(R)

+    api/favorites T,S,F,R

     api/account/rate_limit_status T,S,F,R

     api/help/test T,S,F,R

     api/statuses/friends T,S,F,R

     api/statuses/followers T,S,F,R

     api/friends/ids T,S,F,R

     api/followers/ids T,S,F,R

-    api/direct_messages/new T,S,F,(R)

-    api/direct_messages/conversation T,S,F,(R)

-    api/direct_messages/all T,S,F,(R)

-    api/direct_messages/sent T,S,F,(R)

-    api/direct_messages T,S,F,(R)

+    api/direct_messages/new T,S,F,R

+    api/direct_messages/conversation T,S,F,R

+    api/direct_messages/all T,S,F,R

+    api/direct_messages/sent T,S,F,R

+    api/direct_messages T,S,F,R

     api/oauth/request_token T,S,F,R

     api/oauth/access_token T,S,F,R

+    api/favorites T,S,R

+    api/favorites/create T,S,R

+    api/favorites/destroy T,S,R

 

 Twitter API functions supported by StatusNet but not currently by Friendica or Red

 

-    api/favorites T,S

-    api/favorites/create T,S

-    api/favorites/destroy T,S

     api/statuses/retweets_of_me T,S

     api/friendships/create T,S

     api/friendships/destroy T,S