github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-21 06:18:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source 
Conflicts:
	modoboa/locale/cs_CZ/LC_MESSAGES/django.po
	modoboa/locale/de/LC_MESSAGES/django.po
	modoboa/locale/en/LC_MESSAGES/django.po
	modoboa/locale/es/LC_MESSAGES/django.po
	modoboa/locale/fr/LC_MESSAGES/django.po
	modoboa/locale/it/LC_MESSAGES/django.po
	modoboa/locale/nl_NL/LC_MESSAGES/django.po
	modoboa/locale/pt_PT/LC_MESSAGES/django.po
	modoboa/locale/ru/LC_MESSAGES/django.po
	modoboa/locale/sv/LC_MESSAGES/django.po
This commit is contained in:
Antoine Nguyen
2014-08-24 14:51:30 +02:00
parent 2b25600dd2 a28833b162
commit 84837d3813
37 changed files with 3980 additions and 3349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/integration/imap_and_smtp.rst
+1
View File
@@ -443,6 +443,7 @@ Use the following configuration in the :file:`/etc/postfix/main.cf` file
virtual_alias_domains = <driver>:/etc/postfix/sql-domain-aliases.cf
virtual_alias_maps = <driver>:/etc/postfix/sql-aliases.cf,
<driver>:/etc/postfix/sql-domain-aliases-mailboxes.cf,
<driver>:/etc/postfix/sql-mailboxes-self-aliases.cf,
<driver>:/etc/postfix/sql-catchall-aliases.cf
smtpd_recipient_restrictions =