From 790055571db1a7ebb0cd93d0ec8d1a5e75cbc702 Mon Sep 17 00:00:00 2001
From: tomneedham <tom@owncloud.com>
Date: Thu, 14 Nov 2013 01:00:14 +0000
Subject: [PATCH] Update lib/private/api.php after merge conflict

---
 lib/private/api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/api.php b/lib/private/api.php
index 45e7f18bd4..913b3ff0a1 100644
--- a/lib/private/api.php
+++ b/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