diff options
| author | Marin Treselj <marin@pixelipo.com> | 2017-08-04 10:23:52 +0200 |
|---|---|---|
| committer | Marin Treselj <marin@pixelipo.com> | 2017-08-04 10:23:52 +0200 |
| commit | 54444110d9868f8fd173129be0b958a1ed5d9e0c (patch) | |
| tree | e026d5ac858c114c3c0edc0d2ad96a93740a3b57 /remote.php | |
| parent | a4d984532660637fd7ce604762b019479f641dcd (diff) | |
| parent | ac4927809c2cf8d66c9f6aa84a7009b521a8d0d7 (diff) | |
| download | nextcloud-server-54444110d9868f8fd173129be0b958a1ed5d9e0c.tar.gz nextcloud-server-54444110d9868f8fd173129be0b958a1ed5d9e0c.zip | |
Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout
Diffstat (limited to 'remote.php')
| -rw-r--r-- | remote.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remote.php b/remote.php index 8e74967365d..1d83e5a7f83 100644 --- a/remote.php +++ b/remote.php @@ -41,7 +41,7 @@ class RemoteException extends Exception { } /** - * @param Exception | Error $e + * @param Exception|Error $e */ function handleException($e) { $request = \OC::$server->getRequest(); |