Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: interface/web/admin/lib/lang/se_remote_action.lng interface/web/admin/lib/lang/se_system_config.lng interface/web/dashboard/lib/lang/se_dashlet_limits.lng interface/web/mail/lib/lang/se_mail_domain.lng interface/web/monitor/lib/lang/se.lng interface/web/sites/lib/lang/se_web_aliasdomain.lng interface/web/sites/lib/lang/se_web_domain_list.lng interface/web/sites/lib/lang/se_web_subdomain.lng interface/web/sites/lib/lang/se_web_subdomain_list.lng interface/web/sites/lib/lang/se_web_vhost_domain.lng interface/web/sites/lib/lang/se_web_vhost_subdomain.lng interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng server/mods-available/rescue_core_module.inc.php server/plugins-available/cron_plugin.inc.php
Showing
- install/autoupdate.php 4 additions, 2 deletionsinstall/autoupdate.php
- install/dist/lib/fedora.lib.php 6 additions, 2 deletionsinstall/dist/lib/fedora.lib.php
- install/dist/lib/gentoo.lib.php 3 additions, 0 deletionsinstall/dist/lib/gentoo.lib.php
- install/dist/lib/opensuse.lib.php 4 additions, 2 deletionsinstall/dist/lib/opensuse.lib.php
- install/install.php 3 additions, 1 deletioninstall/install.php
- install/lib/installer_base.lib.php 3 additions, 2 deletionsinstall/lib/installer_base.lib.php
- install/sql/incremental/upd_0074.sql 1 addition, 1 deletioninstall/sql/incremental/upd_0074.sql
- install/sql/incremental/upd_0076.sql 1 addition, 0 deletionsinstall/sql/incremental/upd_0076.sql
- install/sql/ispconfig3.sql 1 addition, 1 deletioninstall/sql/ispconfig3.sql
- install/tpl/nginx_apps.vhost.master 1 addition, 1 deletioninstall/tpl/nginx_apps.vhost.master
- install/update.php 4 additions, 2 deletionsinstall/update.php
- interface/lib/classes/validate_password.inc.php 9 additions, 1 deletioninterface/lib/classes/validate_password.inc.php
- interface/lib/lang/se.lng 106 additions, 105 deletionsinterface/lib/lang/se.lng
- interface/web/admin/form/system_config.tform.php 5 additions, 5 deletionsinterface/web/admin/form/system_config.tform.php
- interface/web/admin/lib/lang/de_system_config.lng 1 addition, 1 deletioninterface/web/admin/lib/lang/de_system_config.lng
- interface/web/admin/lib/lang/se.lng 43 additions, 42 deletionsinterface/web/admin/lib/lang/se.lng
- interface/web/admin/lib/lang/se_directive_snippets.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/se_directive_snippets.lng
- interface/web/admin/lib/lang/se_directive_snippets_list.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/se_directive_snippets_list.lng
- interface/web/admin/lib/lang/se_firewall.lng 7 additions, 6 deletionsinterface/web/admin/lib/lang/se_firewall.lng
- interface/web/admin/lib/lang/se_firewall_list.lng 6 additions, 5 deletionsinterface/web/admin/lib/lang/se_firewall_list.lng
Loading
Please register or sign in to comment