Merge branch 'stable-3.1' into 'db_remote-DNS_Slave_Fix'
# Conflicts: # interface/web/admin/form/system_config.tform.php # interface/web/admin/lib/lang/en_system_config.lng # interface/web/admin/lib/lang/it_system_config.lng
No related branches found
No related tags found
Showing
- helper_scripts/fixcerts 151 additions, 0 deletionshelper_scripts/fixcerts
- install/dist/conf/centos70.conf.php 5 additions, 0 deletionsinstall/dist/conf/centos70.conf.php
- install/dist/conf/centos72.conf.php 5 additions, 0 deletionsinstall/dist/conf/centos72.conf.php
- install/dist/conf/debian100.conf.php 234 additions, 0 deletionsinstall/dist/conf/debian100.conf.php
- install/dist/conf/debian40.conf.php 5 additions, 0 deletionsinstall/dist/conf/debian40.conf.php
- install/dist/conf/debian60.conf.php 5 additions, 0 deletionsinstall/dist/conf/debian60.conf.php
- install/dist/conf/debian90.conf.php 5 additions, 0 deletionsinstall/dist/conf/debian90.conf.php
- install/dist/conf/debiantesting.conf.php 18 additions, 9 deletionsinstall/dist/conf/debiantesting.conf.php
- install/dist/conf/fedora9.conf.php 5 additions, 0 deletionsinstall/dist/conf/fedora9.conf.php
- install/dist/conf/gentoo.conf.php 5 additions, 0 deletionsinstall/dist/conf/gentoo.conf.php
- install/dist/conf/opensuse112.conf.php 5 additions, 0 deletionsinstall/dist/conf/opensuse112.conf.php
- install/dist/conf/ubuntu1604.conf.php 5 additions, 0 deletionsinstall/dist/conf/ubuntu1604.conf.php
- install/dist/conf/ubuntu1710.conf.php 5 additions, 0 deletionsinstall/dist/conf/ubuntu1710.conf.php
- install/dist/conf/ubuntu1804.conf.php 6 additions, 1 deletioninstall/dist/conf/ubuntu1804.conf.php
- install/dist/lib/centos_base.lib.php 19 additions, 0 deletionsinstall/dist/lib/centos_base.lib.php
- install/dist/lib/debian60.lib.php 32 additions, 1 deletioninstall/dist/lib/debian60.lib.php
- install/dist/lib/fedora.lib.php 34 additions, 3 deletionsinstall/dist/lib/fedora.lib.php
- install/dist/lib/gentoo.lib.php 3 additions, 3 deletionsinstall/dist/lib/gentoo.lib.php
- install/dist/lib/opensuse.lib.php 2 additions, 2 deletionsinstall/dist/lib/opensuse.lib.php
- install/dist/tpl/gentoo/amavisd-ispconfig.conf.master 1 addition, 1 deletioninstall/dist/tpl/gentoo/amavisd-ispconfig.conf.master
Loading
Please register or sign in to comment