aboutsummaryrefslogtreecommitdiffstats
path: root/.homeinstall/hubzilla-config.txt.template
diff options
context:
space:
mode:
authorManuel Jiménez Friaza <mjfriaza@openmailbox.org>2018-11-24 13:01:01 +0100
committerManuel Jiménez Friaza <mjfriaza@openmailbox.org>2018-11-24 13:01:01 +0100
commitf865d6e5dab19122fffc677da495b21d3d5e93e7 (patch)
tree8631750db2c385438207326479350ea909a625b4 /.homeinstall/hubzilla-config.txt.template
parent0bba9482dfbcc0fd8bea880ac3820548281ecfc2 (diff)
parentbc9f2922e0e255e97cb607d099f60c8a81c4736f (diff)
downloadvolse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.tar.gz
volse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.tar.bz2
volse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.zip
Resolved merge conflicts
Diffstat (limited to '.homeinstall/hubzilla-config.txt.template')
-rw-r--r--.homeinstall/hubzilla-config.txt.template2
1 files changed, 2 insertions, 0 deletions
diff --git a/.homeinstall/hubzilla-config.txt.template b/.homeinstall/hubzilla-config.txt.template
index 2776ccd27..e42da0e4e 100644
--- a/.homeinstall/hubzilla-config.txt.template
+++ b/.homeinstall/hubzilla-config.txt.template
@@ -18,6 +18,8 @@ db_pass=
# Example: my.cooldomain.org
# Example: cooldomain.org
#
+# Example: localhost (test installation without certificates for httpS)
+#
# Email is optional
#
#