Merge branch 'develop' into '6497_php_sort_version_3'
# Conflicts: # install/sql/incremental/upd_dev_collection.sql
Showing
- helper_scripts/multifile_add 32 additions, 0 deletionshelper_scripts/multifile_add
- install/sql/incremental/upd_dev_collection.sql 1 addition, 1 deletioninstall/sql/incremental/upd_dev_collection.sql
- install/sql/ispconfig3.sql 1 addition, 0 deletionsinstall/sql/ispconfig3.sql
- install/tpl/debian6_dovecot-sql.conf.master 2 additions, 2 deletionsinstall/tpl/debian6_dovecot-sql.conf.master
- install/tpl/debian_dovecot-sql.conf.master 2 additions, 2 deletionsinstall/tpl/debian_dovecot-sql.conf.master
- install/tpl/fedora_dovecot-sql.conf.master 2 additions, 2 deletionsinstall/tpl/fedora_dovecot-sql.conf.master
- install/tpl/opensuse_dovecot-sql.conf.master 2 additions, 2 deletionsinstall/tpl/opensuse_dovecot-sql.conf.master
- interface/lib/classes/dns_wizard.inc.php 297 additions, 0 deletionsinterface/lib/classes/dns_wizard.inc.php
- interface/lib/classes/remote.d/dns.inc.php 27 additions, 129 deletionsinterface/lib/classes/remote.d/dns.inc.php
- interface/lib/classes/tools_sites.inc.php 5 additions, 1 deletioninterface/lib/classes/tools_sites.inc.php
- interface/web/client/form/client.tform.php 1 addition, 0 deletionsinterface/web/client/form/client.tform.php
- interface/web/client/templates/client_edit_address.htm 3 additions, 6 deletionsinterface/web/client/templates/client_edit_address.htm
- interface/web/dns/dns_wizard.php 5 additions, 235 deletionsinterface/web/dns/dns_wizard.php
- interface/web/mail/form/mail_user.tform.php 23 additions, 1 deletioninterface/web/mail/form/mail_user.tform.php
- interface/web/mail/lib/lang/ar_mail_user.lng 2 additions, 0 deletionsinterface/web/mail/lib/lang/ar_mail_user.lng
- interface/web/mail/lib/lang/bg_mail_user.lng 2 additions, 0 deletionsinterface/web/mail/lib/lang/bg_mail_user.lng
- interface/web/mail/lib/lang/ca_mail_user.lng 2 additions, 0 deletionsinterface/web/mail/lib/lang/ca_mail_user.lng
- interface/web/mail/lib/lang/de_mail_user.lng 3 additions, 0 deletionsinterface/web/mail/lib/lang/de_mail_user.lng
- interface/web/mail/lib/lang/dk_mail_user.lng 2 additions, 0 deletionsinterface/web/mail/lib/lang/dk_mail_user.lng
- interface/web/mail/lib/lang/el_mail_user.lng 2 additions, 0 deletionsinterface/web/mail/lib/lang/el_mail_user.lng
Loading
Please register or sign in to comment