Merge branch 'master' into mmn_fixes

2016-01-30 00:03:25 +01:00
parent c6ae883ad2 771f08b3c7
commit 367fc054dc
68 changed files with 1 additions and 1775 deletions
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -366,4 +366,4 @@ class HTTPClient extends HTTP_Request2
        } while ($maxRedirs);
        return new GNUsocial_HTTPResponse($response, $this->getUrl(), $redirs);
    }
-}
+}