aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-28 06:24:47 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-28 06:24:47 +0100
commitd49c5b3d8e4f430bf72ed4e1ded2e1d08c10fd29 (patch)
tree3e9ad7ad58a3fcd66c14a4f4275a56725b77a7f2 /view
parentc766cf9565129b762998e709f5ee7c3eb14cffca (diff)
parent9ea904c12d43de10aa452ad687830d5d68f5274c (diff)
downloadvolse-hubzilla-d49c5b3d8e4f430bf72ed4e1ded2e1d08c10fd29.tar.gz
volse-hubzilla-d49c5b3d8e4f430bf72ed4e1ded2e1d08c10fd29.tar.bz2
volse-hubzilla-d49c5b3d8e4f430bf72ed4e1ded2e1d08c10fd29.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view')
-rw-r--r--view/en/htconfig.tpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 17ee7bfeb..17f19702f 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -28,7 +28,7 @@ $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
$default_timezone = '{{$timezone}}';
-// What is your site name?
+// What is your site name? DO NOT ADD A TRAILING SLASH!
$a->config['system']['baseurl'] = '{{$siteurl}}';
$a->config['system']['sitename'] = "Hubzilla";