diff options
author | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 11:24:17 +0200 |
---|---|---|
committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 11:24:17 +0200 |
commit | f2702ff1ca45d72300eed5dfa58ebc19aa6e9910 (patch) | |
tree | b1424be17877cbd25bf3781600d353efd3dd0759 /ocs | |
parent | 7e4dcd268f6cb6618600718a51c4d882e9027829 (diff) | |
parent | 9be836814cb4165ea54a086a0f97526d783bcd37 (diff) | |
download | nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.tar.gz nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.zip |
Merge master into oc_preview
Diffstat (limited to 'ocs')
-rw-r--r-- | ocs/routes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ocs/routes.php b/ocs/routes.php index 5fcf05e4f99..1ea698c7a83 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -74,4 +74,4 @@ OC_API::register( array('OC_OCS_Cloud', 'getCapabilities'), 'core', OC_API::USER_AUTH - );
\ No newline at end of file + ); |