Merged stuff from upstream/master
authorRoland Haeder <roland@mxchange.org>
Sat, 30 Jan 2016 12:38:25 +0000 (13:38 +0100)
committerRoland Haeder <roland@mxchange.org>
Sat, 30 Jan 2016 12:38:25 +0000 (13:38 +0100)
commitdd93420b08910a8bf9967dad7906351695d1ac55
tree8f0d6d1b03df755b0cbb93ae3240af83980fd4a7
parent5beea658a463609933ea11f6c0f0fd1773daddc6
Merged stuff from upstream/master

Signed-off-by: Roland Haeder <roland@mxchange.org>
15 files changed:
actions/apiaccountverifycredentials.php
actions/apimediaupload.php
actions/replies.php
classes/File.php
classes/File_redirection.php
classes/Notice.php
lib/router.php
plugins/Blacklist/BlacklistPlugin.php
plugins/Bookmark/classes/Bookmark.php
plugins/Event/classes/RSVP.php
plugins/ForceGroup/ForceGroupPlugin.php
plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/lib/salmonaction.php
plugins/TwitterBridge/actions/twitterauthorization.php