external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-24 19:07:23 +01:00
Code Issues Releases Wiki Activity

Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox

Browse Source 
# Conflicts:
#	management/dns_update.py
#	management/web_update.py
#	tests/test_mail.py
This commit is contained in:
downtownallday
2021-05-15 22:35:48 -04:00
parent 7144ed041e 35fa3fe891
commit fc4ad70535
16 changed files with 192 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
management/mailconfig.py
View File

@@ -472,7 +472,7 @@ def get_mail_domains(env, as_map=False, filter_aliases=lambda alias: True, categ
# category is another type of filter. Set to a string value to
# return only those domains of that category. ie. the
# "businessCategory" attribute of the domain must include this
# category. [TODO: this doesn't really belong there, it is here to
# category. [TODO: this doesn't really belong here, it is here to
# make it easy for dns_update to get ssl domains]
#
# If users_only is True, only return domains with email addresses