Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Fri, 22 Jan 2016 16:28:07 +0000 (17:28 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 22 Jan 2016 16:28:07 +0000 (17:28 +0100)
commita0db913ea44c7b6edda06bd6bf1062dcad150270
treea4a1953d6105235280ef5d9b59fc5de2819593c6
parent36b1cc8516dac2a3c6cda6cba1d1fa1337eb1f6d
parentef005987a1ed1ed0774ae7ae88772e3ca4654cbd
Merge remote-tracking branch 'upstream/master' into social-master
lib/default.php
lib/httpclient.php
lib/installer.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/lib/ostatusqueuehandler.php
plugins/OpportunisticQM/lib/opportunisticqueuemanager.php