Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: install/lib/update.lib.php install/sql/incremental/upd_0058.sql install/tpl/server.ini.master interface/lib/classes/remoting_lib.inc.php interface/lib/classes/tform.inc.php interface/web/admin/form/server_config.tform.php interface/web/mail/templates/mail_domain_edit.htm server/cron_daily.php server/lib/classes/monitor_tools.inc.php server/mods-available/monitor_core_module.inc.php server/plugins-available/mail_plugin_dkim.inc.php
Showing
- install/autoupdate.php 1 addition, 1 deletioninstall/autoupdate.php
- install/dist/lib/fedora.lib.php 2 additions, 0 deletionsinstall/dist/lib/fedora.lib.php
- install/dist/lib/gentoo.lib.php 1 addition, 0 deletionsinstall/dist/lib/gentoo.lib.php
- install/dist/lib/opensuse.lib.php 2 additions, 0 deletionsinstall/dist/lib/opensuse.lib.php
- install/install.php 14 additions, 19 deletionsinstall/install.php
- install/lib/installer_base.lib.php 6 additions, 2 deletionsinstall/lib/installer_base.lib.php
- install/lib/update.lib.php 5 additions, 1 deletioninstall/lib/update.lib.php
- install/sql/incremental/upd_0049.sql 1 addition, 2 deletionsinstall/sql/incremental/upd_0049.sql
- install/sql/incremental/upd_0052.sql 1 addition, 5 deletionsinstall/sql/incremental/upd_0052.sql
- install/sql/incremental/upd_0055.sql 1 addition, 3 deletionsinstall/sql/incremental/upd_0055.sql
- install/sql/incremental/upd_0058.sql 0 additions, 1 deletioninstall/sql/incremental/upd_0058.sql
- install/sql/ispconfig3.sql 122 additions, 112 deletionsinstall/sql/ispconfig3.sql
- install/tpl/amavisd_user_config.master 0 additions, 6 deletionsinstall/tpl/amavisd_user_config.master
- install/tpl/config.inc.php.master 2 additions, 0 deletionsinstall/tpl/config.inc.php.master
- install/tpl/opensuse_amavisd_conf.master 0 additions, 6 deletionsinstall/tpl/opensuse_amavisd_conf.master
- install/tpl/server.ini.master 14 additions, 17 deletionsinstall/tpl/server.ini.master
- install/tpl/system.ini.master 0 additions, 1 deletioninstall/tpl/system.ini.master
- install/update.php 4 additions, 8 deletionsinstall/update.php
- interface/lib/classes/aps_base.inc.php 102 additions, 102 deletionsinterface/lib/classes/aps_base.inc.php
- interface/lib/classes/aps_crawler.inc.php 591 additions, 591 deletionsinterface/lib/classes/aps_crawler.inc.php
Loading
Please register or sign in to comment