Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
Conflicts: install/sql/incremental/upd_dev_collection.sql
Showing
- install/dist/lib/fedora.lib.php 13 additions, 2 deletionsinstall/dist/lib/fedora.lib.php
- install/dist/lib/opensuse.lib.php 12 additions, 1 deletioninstall/dist/lib/opensuse.lib.php
- install/lib/installer_base.lib.php 14 additions, 2 deletionsinstall/lib/installer_base.lib.php
- install/sql/incremental/upd_dev_collection.sql 2 additions, 0 deletionsinstall/sql/incremental/upd_dev_collection.sql
- install/tpl/debian_postfix.conf.master 3 additions, 1 deletioninstall/tpl/debian_postfix.conf.master
- install/tpl/fedora_postfix.conf.master 3 additions, 1 deletioninstall/tpl/fedora_postfix.conf.master
- install/tpl/gentoo_postfix.conf.master 3 additions, 1 deletioninstall/tpl/gentoo_postfix.conf.master
- install/tpl/mysql-virtual_policy_greylist.cf.master 5 additions, 0 deletionsinstall/tpl/mysql-virtual_policy_greylist.cf.master
- install/tpl/opensuse_postfix.conf.master 3 additions, 1 deletioninstall/tpl/opensuse_postfix.conf.master
- interface/lib/classes/quota_lib.inc.php 62 additions, 1 deletioninterface/lib/classes/quota_lib.inc.php
- interface/lib/classes/remote.d/sites.inc.php 15 additions, 0 deletionsinterface/lib/classes/remote.d/sites.inc.php
- interface/web/client/lib/remote.conf.php 1 addition, 1 deletioninterface/web/client/lib/remote.conf.php
- interface/web/mail/form/mail_alias.tform.php 6 additions, 0 deletionsinterface/web/mail/form/mail_alias.tform.php
- interface/web/mail/form/mail_forward.tform.php 6 additions, 0 deletionsinterface/web/mail/form/mail_forward.tform.php
- interface/web/mail/form/mail_user.tform.php 6 additions, 0 deletionsinterface/web/mail/form/mail_user.tform.php
- interface/web/mail/lib/lang/ar_mail_alias.lng 1 addition, 0 deletionsinterface/web/mail/lib/lang/ar_mail_alias.lng
- interface/web/mail/lib/lang/ar_mail_forward.lng 1 addition, 0 deletionsinterface/web/mail/lib/lang/ar_mail_forward.lng
- interface/web/mail/lib/lang/ar_mail_user.lng 1 addition, 0 deletionsinterface/web/mail/lib/lang/ar_mail_user.lng
- interface/web/mail/lib/lang/bg_mail_alias.lng 1 addition, 0 deletionsinterface/web/mail/lib/lang/bg_mail_alias.lng
- interface/web/mail/lib/lang/bg_mail_forward.lng 1 addition, 0 deletionsinterface/web/mail/lib/lang/bg_mail_forward.lng
Loading
Please register or sign in to comment