Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
1 changed files with 1 additions and 0 deletions
Showing only changes of commit e54eac6227 - Show all commits

1
docker/lemmy.hjson vendored
View File

@ -60,6 +60,7 @@
# smtp_password: ""
# # address to send emails from, eg "info@your-instance.com"
# smtp_from_address: ""
# use_tls: true
# }
}