Merge branch '0.10' into 0.11

This commit is contained in:
sebres 2018-06-14 12:36:22 +02:00
commit 0eaa0ecd86

View file

@ -65,7 +65,7 @@ actionban = curl --fail --data-urlencode "server=<email>" --data "apikey=<apikey
actionunban =
# Option: email
# Notes server email address, as per blocklise.de account
# Notes server email address, as per blocklist.de account
# Values: STRING Default: None
#
#email =