]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Mon, 30 Nov 2015 14:27:12 +0000 (15:27 +0100)
committerRoland Haeder <roland@mxchange.org>
Mon, 30 Nov 2015 14:27:12 +0000 (15:27 +0100)
commitf9ddb0e20919b1b22b1a78463ffb227a009c5614
tree8fddfe07a22f9be93ef0f9e14286ca3c8602c2ce
parentc09e794d81163b67fc6ab3f442927eef6f47c8bd
parent5b847eff120264c3e9571e8a939e6b3a30e68032
Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
41 files changed:
actions/apimediaupload.php
actions/apistatusesdestroy.php
actions/apistatusesshow.php
actions/apitimelineuser.php
classes/File_redirection.php
classes/Notice.php
classes/User_group.php
lib/action.php
lib/activity.php
lib/attachmentlist.php
lib/default.php
lib/framework.php
lib/imagefile.php
lib/implugin.php
lib/noticelistitem.php
lib/profileaction.php
lib/router.php
lib/search_engines.php
lib/util.php
plugins/Bookmark/BookmarkPlugin.php
plugins/Bookmark/actions/newbookmark.php
plugins/Event/EventPlugin.php
plugins/Event/actions/newevent.php
plugins/Event/classes/Happening.php
plugins/Favorite/classes/Fave.php
plugins/GNUsocialPhotos/actions/editphoto.php
plugins/Linkback/LinkbackPlugin.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/actions/ostatusinit.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/lib/magicenvelope.php
plugins/OStatus/lib/salmonaction.php
plugins/OStatus/scripts/resub-feed.php
plugins/OStatus/scripts/testfeed.php
plugins/OStatus/scripts/update-profile-data.php
plugins/OStatus/scripts/update-profile.php
plugins/OStatus/scripts/update_ostatus_profiles.php
plugins/Oembed/classes/File_oembed.php
plugins/Realtime/RealtimePlugin.php
plugins/Xmpp/XmppPlugin.php
scripts/upgrade.php