]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Sun, 15 Feb 2015 20:50:35 +0000 (21:50 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 15 Feb 2015 20:50:35 +0000 (21:50 +0100)
commite528a6db559554b070202ed36968a5fb6aee1178
treed7eb8a508663aa4d1159d774ff989d50413b11d2
parent826f8f3833a511073d4c0690227b6e8c93f7e666
parent2b93643277d4198f6b4eedc918790549a914adac
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
lib/inboxnoticestream.php
plugins/Favorite/actions/apifavoritecreate.php
plugins/OStatus/actions/pushhub.php
plugins/WebFinger/WebFingerPlugin.php
plugins/YammerImport/lib/yammerimporter.php
scripts/commandline.inc.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
23 files changed:
actions/apistatusesshow.php
actions/editpeopletag.php
classes/Notice.php
extlib/DB/DataObject.php
extlib/DB/DataObject/Cast.php
extlib/DB/DataObject/Generator.php
extlib/DB/DataObject/createTables.php
lib/default.php
lib/framework.php
lib/menu.php
lib/router.php
lib/util.php
plugins/AnonymousFave/actions/anonfavor.php
plugins/Favorite/actions/apifavoritecreate.php
plugins/Favorite/actions/atompubshowfavorite.php
plugins/OStatus/classes/FeedSub.php
plugins/OStatus/scripts/gcfeeds.php
plugins/QnA/classes/QnA_Answer.php
plugins/TwitterBridge/daemons/synctwitterfriends.php
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/WebFinger/WebFingerPlugin.php
plugins/YammerImport/lib/yammerimporter.php
scripts/commandline.inc.php