Update lib/private/api.php after merge conflict

remotes/origin/stable6
tomneedham 13 years ago
parent b06682b7fb
commit 790055571d
  1. 2
      lib/private/api.php

@ -185,7 +185,7 @@ class OC_API {
} else {
$data = array_merge_recursive($data, $response['response']->getData());
}
$codes[] = $response->getStatusCode();
$codes[] = $response['response']->getStatusCode();
}
// Use any non 100 status codes

Loading…
Cancel
Save