Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php interface/web/mail/lib/lang/de_mail_get.lng interface/web/sites/lib/lang/de_cron.lng interface/web/sites/lib/lang/en_cron.lng interface/web/sites/web_vhost_subdomain_edit.php
No related branches found
No related tags found
Showing
- install/lib/installer_base.lib.php 7 additions, 0 deletionsinstall/lib/installer_base.lib.php
- install/lib/update.lib.php 2 additions, 2 deletionsinstall/lib/update.lib.php
- install/sql/incremental/upd_0073.sql 4 additions, 0 deletionsinstall/sql/incremental/upd_0073.sql
- install/sql/ispconfig3.sql 4 additions, 1 deletioninstall/sql/ispconfig3.sql
- interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php 15 additions, 13 deletionsinterface/lib/plugins/sites_web_vhost_domain_plugin.inc.php
- interface/web/client/client_edit.php 1 addition, 1 deletioninterface/web/client/client_edit.php
- interface/web/client/domain_edit.php 2 additions, 2 deletionsinterface/web/client/domain_edit.php
- interface/web/dns/dns_import.php 2 additions, 2 deletionsinterface/web/dns/dns_import.php
- interface/web/dns/dns_slave_edit.php 2 additions, 2 deletionsinterface/web/dns/dns_slave_edit.php
- interface/web/dns/dns_soa_edit.php 2 additions, 2 deletionsinterface/web/dns/dns_soa_edit.php
- interface/web/dns/dns_wizard.php 2 additions, 2 deletionsinterface/web/dns/dns_wizard.php
- interface/web/mail/form/mail_get.tform.php 1 addition, 1 deletioninterface/web/mail/form/mail_get.tform.php
- interface/web/mail/lib/lang/de_mail_get.lng 2 additions, 1 deletioninterface/web/mail/lib/lang/de_mail_get.lng
- interface/web/mail/lib/lang/en_mail_get.lng 1 addition, 0 deletionsinterface/web/mail/lib/lang/en_mail_get.lng
- interface/web/mail/mail_domain_edit.php 2 additions, 2 deletionsinterface/web/mail/mail_domain_edit.php
- interface/web/mail/mail_mailinglist_edit.php 2 additions, 2 deletionsinterface/web/mail/mail_mailinglist_edit.php
- interface/web/mail/templates/mail_get_edit.htm 1 addition, 1 deletioninterface/web/mail/templates/mail_get_edit.htm
- interface/web/sites/cron_edit.php 12 additions, 2 deletionsinterface/web/sites/cron_edit.php
- interface/web/sites/database_user_edit.php 2 additions, 2 deletionsinterface/web/sites/database_user_edit.php
- interface/web/sites/lib/lang/de_cron.lng 2 additions, 0 deletionsinterface/web/sites/lib/lang/de_cron.lng
Loading
Please register or sign in to comment