Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: install/tpl/debian_postfix.conf.master install/tpl/fedora_postfix.conf.master install/tpl/gentoo_postfix.conf.master install/tpl/opensuse_postfix.conf.master install/uninstall.php interface/lib/classes/remoting_lib.inc.php interface/lib/classes/tform.inc.php interface/web/mail/lib/lang/de_mail_user.lng interface/web/mailuser/lib/lang/de_mail_user_cc.lng interface/web/sites/aps_install_package.php interface/web/sites/lib/lang/en_web_vhost_subdomain.lng interface/web/sites/web_vhost_domain_edit.php interface/web/sites/web_vhost_subdomain_edit.php server/cron_daily.php server/lib/classes/monitor_tools.inc.php
No related branches found
No related tags found
Showing
- install/dist/lib/debian60.lib.php 4 additions, 0 deletionsinstall/dist/lib/debian60.lib.php
- install/dist/lib/fedora.lib.php 3 additions, 0 deletionsinstall/dist/lib/fedora.lib.php
- install/dist/lib/opensuse.lib.php 14 additions, 5 deletionsinstall/dist/lib/opensuse.lib.php
- install/lib/install.lib.php 31 additions, 0 deletionsinstall/lib/install.lib.php
- install/lib/installer_base.lib.php 20 additions, 2 deletionsinstall/lib/installer_base.lib.php
- install/sql/incremental/upd_0068.sql 4 additions, 0 deletionsinstall/sql/incremental/upd_0068.sql
- install/sql/ispconfig3.sql 7 additions, 6 deletionsinstall/sql/ispconfig3.sql
- install/tpl/debian_dovecot2.conf.master 1 addition, 0 deletionsinstall/tpl/debian_dovecot2.conf.master
- install/tpl/debian_postfix.conf.master 1 addition, 1 deletioninstall/tpl/debian_postfix.conf.master
- install/tpl/fedora_postfix.conf.master 1 addition, 1 deletioninstall/tpl/fedora_postfix.conf.master
- install/tpl/gentoo_postfix.conf.master 1 addition, 1 deletioninstall/tpl/gentoo_postfix.conf.master
- install/tpl/jk_init.ini.master 2 additions, 2 deletionsinstall/tpl/jk_init.ini.master
- install/tpl/mysql-virtual_forwardings.cf.master 2 additions, 1 deletioninstall/tpl/mysql-virtual_forwardings.cf.master
- install/tpl/opensuse_postfix.conf.master 1 addition, 1 deletioninstall/tpl/opensuse_postfix.conf.master
- install/tpl/opensuse_pureftpd_conf.master 2 additions, 1 deletioninstall/tpl/opensuse_pureftpd_conf.master
- install/uninstall.php 9 additions, 1 deletioninstall/uninstall.php
- interface/lib/classes/aps_crawler.inc.php 30 additions, 9 deletionsinterface/lib/classes/aps_crawler.inc.php
- interface/lib/classes/db_mysql.inc.php 3 additions, 0 deletionsinterface/lib/classes/db_mysql.inc.php
- interface/lib/classes/functions.inc.php 4 additions, 1 deletioninterface/lib/classes/functions.inc.php
- interface/lib/classes/remoting.inc.php 5 additions, 2 deletionsinterface/lib/classes/remoting.inc.php
Loading
Please register or sign in to comment