]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' of git.gnu.io:Quix0r/gnu-social
authorRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 01:09:12 +0000 (03:09 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 01:09:12 +0000 (03:09 +0200)
commitabd90bbdf562614755802885dfb5673645df8575
treee70933b202d01741121417ca6d41e748ea8255ce
parente8d1bb25469fe1ef0cbcb32c3022010997aca4b0
parente4a17fedc64b4519434ccec9262149bdb330d4af
Merge branch 'master' of git.gnu.io:Quix0r/gnu-social

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/apifriendshipsdestroy.php
actions/apifriendshipsexists.php
actions/apifriendshipsshow.php
actions/replies.php
actions/showstream.php
classes/Notice.php
lib/docfile.php
lib/noticeform.php
plugins/APC/APCPlugin.php
plugins/Adsense/AdsensePlugin.php
plugins/Aim/AimPlugin.php
plugins/Aim/lib/aimmanager.php
plugins/Blog/BlogPlugin.php
plugins/Directory/actions/groupdirectory.php
plugins/Directory/actions/userdirectory.php
plugins/Irc/IrcPlugin.php
plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
plugins/Irc/lib/ircmanager.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/Share/actions/apitimelineretweetedtome.php
plugins/Spotify/SpotifyPlugin.php
plugins/TinyMCE/TinyMCEPlugin.php
plugins/VideoThumbnails/VideoThumbnailsPlugin.php
plugins/WebFinger/WebFingerPlugin.php
plugins/XCache/XCachePlugin.php
plugins/YammerImport/actions/yammeradminpanel.php
plugins/YammerImport/actions/yammerauth.php
plugins/YammerImport/lib/yammerimporter.php
89 files changed:
actions/apifriendshipsexists.php
actions/apifriendshipsshow.php
actions/apitimelineuser.php
actions/doc.php
actions/invite.php
actions/register.php
actions/replies.php
actions/shownotice.php
actions/subscribe.php
classes/Avatar.php
classes/Memcached_DataObject.php
classes/Notice.php
classes/User_group.php
htaccess.sample
index.php
lib/action.php
lib/activityimporter.php
lib/attachmentlistitem.php
lib/default.php
lib/docfile.php
lib/formaction.php
lib/framework.php
lib/imagefile.php
lib/implugin.php
lib/installer.php
lib/menu.php
lib/noticeform.php
lib/noticelistitem.php
lib/plugin.php
lib/router.php
lib/rssaction.php
lib/schemaupdater.php
lib/util.php
plugins/AnonymousFave/actions/anonfavor.php
plugins/AuthCrypt/AuthCryptPlugin.php
plugins/Autocomplete/actions/autocomplete.php
plugins/Bookmark/BookmarkPlugin.php
plugins/Bookmark/actions/newbookmark.php
plugins/Cronish/CronishPlugin.php
plugins/DirectMessage/classes/Message.php
plugins/Directory/actions/groupdirectory.php
plugins/Directory/actions/userdirectory.php
plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
plugins/DomainStatusNetwork/actions/globalapi.php
plugins/EmailRegistration/actions/emailregister.php
plugins/EmailReminder/scripts/sendemailreminder.php
plugins/EmailSummary/scripts/sendemailsummary.php
plugins/Event/actions/cancelrsvp.php
plugins/Event/actions/newrsvp.php
plugins/FacebookBridge/actions/facebookfinishlogin.php
plugins/Favorite/actions/apifavoritecreate.php
plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php
plugins/LinkPreview/actions/oembedproxy.php
plugins/Mapstraction/MapstractionPlugin.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/FeedSub.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/lib/salmonaction.php
plugins/Oembed/actions/oembed.php
plugins/OpenID/OpenIDPlugin.php
plugins/OpportunisticQM/OpportunisticQMPlugin.php
plugins/OpportunisticQM/lib/opportunisticqueuemanager.php
plugins/Poll/actions/newpoll.php
plugins/Poll/actions/respondpoll.php
plugins/Poll/classes/Poll.php
plugins/Poll/classes/Poll_response.php
plugins/QnA/QnAPlugin.php
plugins/QnA/actions/qnaclosequestion.php
plugins/QnA/actions/qnanewanswer.php
plugins/QnA/actions/qnanewquestion.php
plugins/QnA/actions/qnareviseanswer.php
plugins/QnA/actions/qnavote.php
plugins/QnA/classes/QnA_Answer.php
plugins/QnA/classes/QnA_Question.php
plugins/RSSCloud/RSSCloudPlugin.php
plugins/Realtime/scripts/cleanupchannels.php
plugins/Recaptcha/RecaptchaPlugin.php
plugins/SearchSub/actions/searchsub.php
plugins/Share/actions/apistatusesretweets.php
plugins/Share/actions/apitimelineretweetedbyme.php
plugins/Share/actions/apitimelineretweetedtome.php
plugins/Share/actions/apitimelineretweetsofme.php
plugins/TagSub/actions/tagsub.php
plugins/TwitterBridge/actions/twitterauthorization.php
plugins/VideoThumbnails/VideoThumbnailsPlugin.php
plugins/WikiHowProfile/WikiHowProfilePlugin.php
scripts/commandline.inc.php
scripts/upgrade.php
statistics_plugin