diff options
| author | tomneedham <tom@owncloud.com> | 2013-11-14 01:00:14 +0000 |
|---|---|---|
| committer | tomneedham <tom@owncloud.com> | 2013-11-14 01:00:14 +0000 |
| commit | 790055571db1a7ebb0cd93d0ec8d1a5e75cbc702 (patch) | |
| tree | 5039a9a8d8071fcf635acfb3fc90cf3038c48007 /lib/private/api.php | |
| parent | b06682b7fb6ccc09fef55da2bb47d8e1612130d9 (diff) | |
| download | nextcloud-server-790055571db1a7ebb0cd93d0ec8d1a5e75cbc702.tar.gz nextcloud-server-790055571db1a7ebb0cd93d0ec8d1a5e75cbc702.zip | |
Update lib/private/api.php after merge conflict
Diffstat (limited to 'lib/private/api.php')
| -rw-r--r-- | lib/private/api.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/api.php b/lib/private/api.php index 45e7f18bd4e..913b3ff0a18 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 |