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

The roundcube password plugin is not disabled.

# Conflicts:
#	management/utils.py
#	setup/start.sh
#	setup/system.sh
#	setup/webmail.sh
#	tools/editconf.py

2023-01-15 20:35:08 -05:00

..

pear_net_ldap2.1cacdebcf6fe82718e5fa701c1ff688405e0f5d9.diff

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

2023-01-15 20:35:08 -05:00