]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Wed, 21 Jan 2015 18:40:47 +0000 (19:40 +0100)
committerRoland Haeder <roland@mxchange.org>
Wed, 21 Jan 2015 18:40:47 +0000 (19:40 +0100)
commitac5b7095b3c270c3a91a704afd7a47e0f4e180c1
treea2cd773ac9dde6c1011b427312300d746b86ad55
parent3637214cbde966679480b12474c9db9e4d1f1eb1
parent8b585ff64771f823d12696947784f0b5bd693795
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/apimediaupload.php
actions/register.php
plugins/OStatus/scripts/update_ostatus_profiles.php
plugins/OpportunisticQM/lib/opportunisticqueuemanager.php
actions/apimediaupload.php
actions/register.php
lib/action.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/scripts/update_ostatus_profiles.php