]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' of gitorious.org:social/mainline into social-master
authorRoland Häder <haeder@hmmdeutschland.de>
Fri, 16 Jan 2015 09:56:00 +0000 (10:56 +0100)
committerRoland Häder <haeder@hmmdeutschland.de>
Fri, 16 Jan 2015 09:56:00 +0000 (10:56 +0100)
commit996345088e8d57cf39fa38129ab50ff02918a275
treeb465faebf01accf2774a690223d82f7889d69857
parentf2bfcdc2c1d7bc4634bb06285380884a57075759
parent96f30dd924be1d6cb6e1b462db12b949c8dac078
Merge branch 'master' of gitorious.org:social/mainline into social-master

Conflicts:
actions/atompubmembershipfeed.php
actions/atompubshowmembership.php
actions/atompubsubscriptionfeed.php
plugins/OStatus/actions/peopletagsalmon.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/lib/salmonaction.php
scripts/stopdaemons.sh

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>
24 files changed:
actions/apitimelineuser.php
actions/atompubshowsubscription.php
actions/deletegroup.php
actions/public.php
actions/replies.php
actions/showgroup.php
actions/showprofiletag.php
actions/tag.php
classes/Notice.php
lib/action.php
lib/default.php
lib/framework.php
lib/noticelistitem.php
lib/searchaction.php
lib/util.php
plugins/Directory/lib/sortablegrouplist.php
plugins/EmailSummary/scripts/sendemailsummary.php
plugins/Favorite/actions/atompubfavoritefeed.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/FeedSub.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/lib/salmonaction.php
plugins/OStatus/scripts/update-profile-data.php
scripts/stopdaemons.sh