Merge branch 'xorg/maint' into xorg/master

[platal.git] / configs / platal.ini

diff --git a/configs/platal.ini b/configs/platal.ini
index 458ef35..a057415 100644 (file)
--- a/configs/platal.ini
+++ b/configs/platal.ini
@@ -104,6 +104,9 @@ secure_domain = ""
 ; command line. The value is computed automatically when php serves a web page.
 baseurl = "https://www.example.org/"
 
+; The base url of the url shortener.
+baseurl_shortener = ""
+
 ; $globals->sitename
 ; The name of the site
 ;
@@ -288,6 +291,9 @@ blacklist_host_resolution_limit =
 ; domain is blacklisted by a spam filter.
 domain_whitelist = ""
 
+; $globals->mail->antispam
+; Default antispam level.
+antispam = ""
 
 ; The mailstorage section contains parameters describing the availability of email storage services
 [MailStorage]