]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' into social-master
authorRoland Häder <haeder@hmmdeutschland.de>
Fri, 9 Jan 2015 08:13:14 +0000 (09:13 +0100)
committerRoland Häder <haeder@hmmdeutschland.de>
Fri, 9 Jan 2015 08:13:14 +0000 (09:13 +0100)
commitf2bfcdc2c1d7bc4634bb06285380884a57075759
treea0e456dbe45370c6e5743a9630f8a8ba8ce9c699
parentb8506d775833fa7ea53e08c58fdf23a4d1257727
parentb00283beffd5b499994b60c48e4a5ea89c9b524a
Merge branch 'master' into social-master

Conflicts:
lib/menu.php
plugins/AccountManager/AccountManagerPlugin.php
plugins/ActivitySpam/ActivitySpamPlugin.php
plugins/BitlyUrl/BitlyUrlPlugin.php
plugins/Blacklist/BlacklistPlugin.php
plugins/Blog/BlogPlugin.php
plugins/Bookmark/BookmarkPlugin.php
plugins/Directory/DirectoryPlugin.php
plugins/Event/EventPlugin.php
plugins/FacebookBridge/FacebookBridgePlugin.php
plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
plugins/OStatus/OStatusPlugin.php
plugins/Poll/PollPlugin.php
plugins/QnA/QnAPlugin.php
plugins/Realtime/RealtimePlugin.php
plugins/Sample/SamplePlugin.php
plugins/SearchSub/SearchSubPlugin.php
plugins/Sitemap/SitemapPlugin.php
plugins/SlicedFavorites/SlicedFavoritesPlugin.php
plugins/SubMirror/SubMirrorPlugin.php
plugins/TagSub/TagSubPlugin.php
plugins/TwitterBridge/TwitterBridgePlugin.php
plugins/UserFlag/UserFlagPlugin.php
plugins/YammerImport/YammerImportPlugin.php

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>
36 files changed:
actions/apisearchatom.php
actions/apitimelineuser.php
actions/deleteuser.php
classes/Notice.php
lib/menu.php
lib/router.php
plugins/AccountManager/AccountManagerPlugin.php
plugins/ActivitySpam/ActivitySpamPlugin.php
plugins/BitlyUrl/BitlyUrlPlugin.php
plugins/Blacklist/BlacklistPlugin.php
plugins/Blog/BlogPlugin.php
plugins/Bookmark/BookmarkPlugin.php
plugins/DirectMessage/actions/apidirectmessage.php
plugins/DirectMessage/actions/showmessage.php
plugins/DirectMessage/lib/inboxmessagelist.php
plugins/Directory/DirectoryPlugin.php
plugins/Directory/actions/userdirectory.php
plugins/Event/EventPlugin.php
plugins/ExtendedProfile/ExtendedProfilePlugin.php
plugins/FacebookBridge/FacebookBridgePlugin.php
plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
plugins/LinkPreview/LinkPreviewPlugin.php
plugins/ModPlus/ModPlusPlugin.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OpenID/OpenIDPlugin.php
plugins/Poll/PollPlugin.php
plugins/QnA/QnAPlugin.php
plugins/Sample/SamplePlugin.php
plugins/SearchSub/SearchSubPlugin.php
plugins/Sitemap/SitemapPlugin.php
plugins/SlicedFavorites/SlicedFavoritesPlugin.php
plugins/SubMirror/SubMirrorPlugin.php
plugins/TagSub/TagSubPlugin.php
plugins/TwitterBridge/TwitterBridgePlugin.php
plugins/UserFlag/UserFlagPlugin.php