Skip to content

RC-0.3: Merge master back into develop #2167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 5, 2018
Merged

RC-0.3: Merge master back into develop #2167

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9691ae1
Update index.md (#2149)
Nov 27, 2018
b0c1ac2
Update index.md (#2149)
Nov 27, 2018
f814f89
Merge pull request #2165 from nmelehan/RC-0.3
nmelehan Dec 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/email/running-a-mail-server/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ Here are some of the most popular spam and virus filter services:
- [Amavis](http://www.amavis.org) is an open source content filter for email that integrates directly with your MTA. It does some checking on its own, and can also be used in conjunction with more robust spam and virus filters.
- [Clam AntiVirus](http://www.clamav.net/lang/en/) is a popular, free, and open-source virus scanner.
- [SpamAssassin](http://spamassassin.apache.org) is a very popular free spam filter.
- [Anti-Spam SMTP Proxy Server](https://sourceforge.net/projects/assp/) Anti-Spam SMTP Proxy Server implements multiple spam filters.

#### What to do if your server has been blacklisted

Expand Down