Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master
authorRoland Haeder <roland@mxchange.org>
Fri, 3 Jul 2015 20:21:00 +0000 (22:21 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 3 Jul 2015 20:21:00 +0000 (22:21 +0200)
commitb22acbb42e2cefa4c3d94f192b735519b1182f07
treeca376b3c3bd53643387e8f812b3437e96bb11d98
parent8ffecae9c63d8d5a533f3d1610d36f93ba21c2fc
parent3f3482f017da7fef0d97c32ba4a0770f11d67cae
Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master

+ kept type-hint 'array' for $data parameter (long tested and working).

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/apiaccountratelimitstatus.php
actions/public.php
actions/userbyid.php
classes/File_redirection.php
lib/apioauthaction.php
lib/clienterroraction.php
lib/servererroraction.php
plugins/OpenID/actions/publicxrds.php
plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
42 files changed:
actions/apiaccountratelimitstatus.php
actions/apiconversation.php
actions/apitimelinetag.php
actions/recoverpassword.php
actions/replies.php
actions/tag.php
actions/tagrss.php
classes/File_redirection.php
classes/File_thumbnail.php
classes/Memcached_DataObject.php
classes/Notice.php
classes/Notice_tag.php
extlib/DB/DataObject.php
lib/action.php
lib/apiaction.php
lib/apioauthaction.php
lib/default.php
lib/framework.php
lib/implugin.php
lib/installer.php
lib/profileaction.php
lib/profileminilist.php
lib/publictagcloudsection.php
lib/urlmapper.php
lib/util.php
plugins/AntiBrute/AntiBrutePlugin.php
plugins/Directory/DirectoryPlugin.php
plugins/Favorite/classes/Fave.php
plugins/ModPlus/ModPlusPlugin.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/lib/salmonaction.php
plugins/OStatus/scripts/update-profile.php
plugins/Oembed/classes/File_oembed.php
plugins/OpenID/OpenIDPlugin.php
plugins/OpenID/actions/publicxrds.php
plugins/QnA/QnAPlugin.php
plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
plugins/WebFinger/WebFingerPlugin.php
plugins/Xmpp/XmppPlugin.php
scripts/console.php
scroller_plugin