aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/admin.php
diff options
context:
space:
mode:
authorSam Tuke <samtuke@owncloud.com>2013-01-31 16:30:37 +0000
committerSam Tuke <samtuke@owncloud.com>2013-01-31 16:30:37 +0000
commit31e723a907399d7d33a0699da082164055f79b3e (patch)
tree7da079cc3db0a46512da1b02cc19307337d9ce54 /apps/files/admin.php
parentc7b1bdf00e65cca2a42d77fc5f27d0ea69e53be3 (diff)
parent209d599ec5b00c5b92a33e902867fc621e725c93 (diff)
downloadnextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.tar.gz
nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.zip
Merge github.com:owncloud/core
Conflicts: lib/public/share.php
Diffstat (limited to 'apps/files/admin.php')
-rw-r--r--apps/files/admin.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/apps/files/admin.php b/apps/files/admin.php
index f747f8645f6..02c3147dba5 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -21,10 +21,6 @@
*
*/
-
-// Init owncloud
-
-
OCP\User::checkAdminUser();
$htaccessWorking=(getenv('htaccessWorking')=='true');