]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Tue, 27 Jan 2015 18:34:41 +0000 (19:34 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 27 Jan 2015 18:34:41 +0000 (19:34 +0100)
commit429be8e9ae1f4fb91c76eb0abeee8c919b1898bc
tree82e977497fc41f41a7f24120bf598c48ee18f8ec
parentb017675976840cb3622eb801af3dbc7caa93e605
parenteaaef2aec9339dc7eb338024f1b62d67fb9531e4
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
lib/default.php
lib/util.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/scripts/testfeed.php
plugins/OStatus/scripts/update_ostatus_profiles.php