summaryrefslogtreecommitdiffstats
path: root/settings/templates
diff options
context:
space:
mode:
authorTom Needham <tom@owncloud.com>2012-12-16 22:29:00 +0000
committerTom Needham <tom@owncloud.com>2012-12-16 22:29:00 +0000
commit3c98f36121c10f703904d63cd531b7bbf6ee9454 (patch)
treec12c9f737e036cec5f1b235214902473b6b418d5 /settings/templates
parent39b51997756ebb233be10ca5a8ced0d6c60d0dac (diff)
parent811b571cb3da8494797ed70c5b967067cc2a1b5b (diff)
downloadnextcloud-server-3c98f36121c10f703904d63cd531b7bbf6ee9454.tar.gz
nextcloud-server-3c98f36121c10f703904d63cd531b7bbf6ee9454.zip
Merge branch 'master' into ocs_api
Diffstat (limited to 'settings/templates')
-rw-r--r--settings/templates/settings.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/templates/settings.php b/settings/templates/settings.php
index 12368a1cdb6..de8092eeaff 100644
--- a/settings/templates/settings.php
+++ b/settings/templates/settings.php
@@ -6,4 +6,4 @@
<?php foreach($_['forms'] as $form) {
echo $form;
-};?> \ No newline at end of file
+};