diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-12-14 19:15:05 +0400 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-12-14 19:15:05 +0400 |
| commit | 5fe61296981343a3f877618aeecfc33ea7fed3c1 (patch) | |
| tree | 919ea533c8d98f71f7c77d534eb0595207d22a17 /ocs | |
| parent | 4facd766e3712d4c714f2e1bf2ad4be41461a7cc (diff) | |
| parent | f0893fb8fe7f0642ae30de2e1168472377c127e2 (diff) | |
Merge master into ocs_api, fix conflicts.
Diffstat (limited to 'ocs')
| -rw-r--r-- | ocs/providers.php | 16 | ||||
| -rw-r--r-- | ocs/v1.php | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/ocs/providers.php b/ocs/providers.php index fa01deb9ad1..0c7cbaeff08 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -3,22 +3,22 @@ /** * ownCloud * -* @author Frank Karlitschek -* @copyright 2012 Frank Karlitschek frank@owncloud.org -* +* @author Frank Karlitschek +* @copyright 2012 Frank Karlitschek frank@owncloud.org +* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either +* License as published by the Free Software Foundation; either * version 3 of the License, or any later version. -* +* * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public +* +* You should have received a copy of the GNU Affero General Public * License along with this library. If not, see <http://www.gnu.org/licenses/>. -* +* */ require_once '../lib/base.php'; diff --git a/ocs/v1.php b/ocs/v1.php index ac1312afb67..af83a56ff14 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -3,22 +3,22 @@ /** * ownCloud * -* @author Frank Karlitschek -* @copyright 2012 Frank Karlitschek frank@owncloud.org -* +* @author Frank Karlitschek +* @copyright 2012 Frank Karlitschek frank@owncloud.org +* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either +* License as published by the Free Software Foundation; either * version 3 of the License, or any later version. -* +* * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public +* +* You should have received a copy of the GNU Affero General Public * License along with this library. If not, see <http://www.gnu.org/licenses/>. -* +* */ require_once('../lib/base.php'); |