]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Fri, 13 Mar 2015 03:01:44 +0000 (04:01 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 13 Mar 2015 03:01:44 +0000 (04:01 +0100)
commitb8cd496971e0ca5d684891fa19b0f322b3d19ab0
treec5588c749a2a2180ae8f31de6417b5c3cfd51a20
parent58a8177f94e03266052aa24abe044fdcd5aa1246
parentd9ed2a0fae4e1eeacf4c513bf48b4bf368349456
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
actions/showstream.php
classes/Notice.php
plugins/OStatus/classes/Ostatus_profile.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
18 files changed:
actions/replies.php
actions/showstream.php
classes/Avatar.php
classes/Notice.php
classes/User_group.php
lib/apiaction.php
lib/default.php
lib/imagefile.php
lib/noticelistitem.php
lib/router.php
plugins/FacebookBridge/actions/facebookfinishlogin.php
plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/QnA/QnAPlugin.php
plugins/Share/actions/apistatusesretweets.php
plugins/Share/actions/apitimelineretweetedbyme.php
plugins/Share/actions/apitimelineretweetedtome.php
plugins/Share/actions/apitimelineretweetsofme.php