diff options
| author | Robin <robin@Amaya.(none)> | 2010-04-28 12:01:05 +0200 |
|---|---|---|
| committer | Robin <robin@Amaya.(none)> | 2010-04-28 12:01:05 +0200 |
| commit | fb498b9534b545c0e66cb82304e64f199c77a463 (patch) | |
| tree | 5dee29e558a580fe57d777aa41b493671b0f5a3b /admin | |
| parent | 09add452d93f185d89ab51b67cda2fc384772db5 (diff) | |
| parent | 854e0c5a9c9060e827fbbfddffeeeadfc2d27278 (diff) | |
| download | nextcloud-server-fb498b9534b545c0e66cb82304e64f199c77a463.tar.gz nextcloud-server-fb498b9534b545c0e66cb82304e64f199c77a463.zip | |
fix merge conflicts
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/index.php | 41 | ||||
| -rw-r--r-- | admin/index.php~ | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/admin/index.php b/admin/index.php new file mode 100644 index 00000000000..2331c22f062 --- /dev/null +++ b/admin/index.php @@ -0,0 +1,41 @@ +<?php + +/** +* ownCloud +* +* @author Frank Karlitschek +* @copyright 2010 Frank Karlitschek karlitschek@kde.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 +* 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 Lesser General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +$CONFIG_ERROR=''; + +require_once('../inc/lib_base.php'); + + +OC_UTIL::showheader(); + +$FIRSTRUN=false; + +echo('<div class="center">'); +OC_CONFIG::showadminform(); +echo('</div>'); + + +OC_UTIL::showfooter(); + +?> + diff --git a/admin/index.php~ b/admin/index.php~ new file mode 100644 index 00000000000..8d1c8b69c3f --- /dev/null +++ b/admin/index.php~ @@ -0,0 +1 @@ + |