Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: install/sql/ispconfig3.sql install/tpl/config.inc.php.master interface/lib/config.inc.php interface/web/admin/lib/lang/de_system_config.lng
No related branches found
No related tags found
Showing
- install/dist/lib/fedora.lib.php 4 additions, 4 deletionsinstall/dist/lib/fedora.lib.php
- install/dist/lib/gentoo.lib.php 6 additions, 6 deletionsinstall/dist/lib/gentoo.lib.php
- install/dist/lib/opensuse.lib.php 4 additions, 4 deletionsinstall/dist/lib/opensuse.lib.php
- install/lib/install.lib.php 0 additions, 37 deletionsinstall/lib/install.lib.php
- install/lib/installer_base.lib.php 4 additions, 4 deletionsinstall/lib/installer_base.lib.php
- install/lib/update.lib.php 2 additions, 2 deletionsinstall/lib/update.lib.php
- interface/web/admin/form/system_config.tform.php 3 additions, 3 deletionsinterface/web/admin/form/system_config.tform.php
- interface/web/admin/lib/lang/de_system_config.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/de_system_config.lng
- interface/web/admin/lib/lang/en_system_config.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/en_system_config.lng
- interface/web/admin/templates/system_config_mail_edit.htm 3 additions, 3 deletionsinterface/web/admin/templates/system_config_mail_edit.htm
- interface/web/client/domain_edit.php 50 additions, 8 deletionsinterface/web/client/domain_edit.php
- interface/web/client/templates/domain_edit.htm 0 additions, 2 deletionsinterface/web/client/templates/domain_edit.htm
- interface/web/sites/shell_user_edit.php 3 additions, 1 deletioninterface/web/sites/shell_user_edit.php
- server/scripts/ispconfig_update.php 2 additions, 2 deletionsserver/scripts/ispconfig_update.php
- server/scripts/update_from_dev.sh 11 additions, 0 deletionsserver/scripts/update_from_dev.sh
- server/scripts/update_from_svn.sh 2 additions, 6 deletionsserver/scripts/update_from_svn.sh
Loading
Please register or sign in to comment