]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Häder <haeder@hmmdeutschland.de>
Thu, 22 Jan 2015 12:36:26 +0000 (13:36 +0100)
committerRoland Häder <haeder@hmmdeutschland.de>
Thu, 22 Jan 2015 12:36:26 +0000 (13:36 +0100)
commit6db61f72a68a76c32526f9b259e6f1e8e6f2b610
tree4bcfa4260d1744cf1def65ba043e506a29cdb05a
parentb92ef93d36947e64da2e2078531848539d18bfea
parent9f87359d044603e870b52bd2afd2cc183b190ef7
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
actions/apiaccountverifycredentials.php
actions/apimediaupload.php
actions/public.php
actions/register.php
plugins/OStatus/scripts/update_ostatus_profiles.php
plugins/OpportunisticQM/lib/opportunisticqueuemanager.php

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>
actions/apiaccountverifycredentials.php
actions/apimediaupload.php
actions/public.php
actions/register.php
lib/action.php
lib/default.php
lib/router.php
lib/util.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/scripts/testfeed.php
plugins/OStatus/scripts/update_ostatus_profiles.php