aboutsummaryrefslogtreecommitdiffstats
path: root/status.php
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-09-28 15:38:49 +0200
committerBart Visscher <bartv@thisnet.nl>2012-09-28 15:38:49 +0200
commitbf1057143cdff8ec289d9d766ab100d64d7ea45d (patch)
tree6c35d0d99a72f27a981a07c93f0ecbf600764cd4 /status.php
parent3efe1d3b24e65ed76d521c24b0cfe4e0ff2e7af5 (diff)
parent5144d26088b98685a37c73c776a9a47203efa68a (diff)
downloadnextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.tar.gz
nextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.zip
Merge branch 'master' into routing
Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php
Diffstat (limited to 'status.php')
-rw-r--r--status.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/status.php b/status.php
index 26731153577..cadca60f292 100644
--- a/status.php
+++ b/status.php
@@ -1,7 +1,7 @@
<?php
/**
-* ownCloud status page. usefull if you want to check from the outside if an owncloud installation exists
+* ownCloud status page. Useful if you want to check from the outside if an ownCloud installation exists
*
* @author Frank Karlitschek
* @copyright 2012 Frank Karlitschek frank@owncloud.org