-
fred authored
Conflicts: bureau/admin/main.php bureau/admin/menu.php bureau/admin/menu_adm.php bureau/admin/menu_aide.php bureau/admin/menu_brouteur.php bureau/admin/menu_sql.php bureau/admin/styles/base.css bureau/admin/webmail/index.php debian/alternc.config debian/alternc.postinst src/sqlbackup.sh src/update_domains.sh
daf5ffbf