Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: install/sql/ispconfig3.sql install/tpl/config.inc.php.master install/tpl/debian_postfix.conf.master install/tpl/fedora_postfix.conf.master install/tpl/gentoo_postfix.conf.master install/tpl/opensuse_postfix.conf.master interface/lib/config.inc.php interface/web/sites/lib/lang/cz_web_subdomain.lng interface/web/sites/lib/lang/cz_web_subdomain_list.lng interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng interface/web/themes/blue/ispconfig_version
No related branches found
No related tags found
Showing
- install/lib/install.lib.php 1 addition, 1 deletioninstall/lib/install.lib.php
- install/lib/installer_base.lib.php 12 additions, 2 deletionsinstall/lib/installer_base.lib.php
- install/tpl/apache_ispconfig.conf.master 2 additions, 0 deletionsinstall/tpl/apache_ispconfig.conf.master
- install/tpl/debian_postfix.conf.master 1 addition, 0 deletionsinstall/tpl/debian_postfix.conf.master
- install/tpl/fedora_postfix.conf.master 1 addition, 0 deletionsinstall/tpl/fedora_postfix.conf.master
- install/tpl/gentoo_postfix.conf.master 1 addition, 0 deletionsinstall/tpl/gentoo_postfix.conf.master
- install/tpl/opensuse_postfix.conf.master 1 addition, 0 deletionsinstall/tpl/opensuse_postfix.conf.master
- interface/lib/lang/cz.lng 8 additions, 7 deletionsinterface/lib/lang/cz.lng
- interface/web/admin/lib/lang/cz.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz.lng
- interface/web/admin/lib/lang/cz_directive_snippets.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_directive_snippets.lng
- interface/web/admin/lib/lang/cz_directive_snippets_list.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_directive_snippets_list.lng
- interface/web/admin/lib/lang/cz_firewall.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_firewall.lng
- interface/web/admin/lib/lang/cz_firewall_list.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_firewall_list.lng
- interface/web/admin/lib/lang/cz_groups.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_groups.lng
- interface/web/admin/lib/lang/cz_groups_list.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_groups_list.lng
- interface/web/admin/lib/lang/cz_iptables.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_iptables.lng
- interface/web/admin/lib/lang/cz_iptables_list.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_iptables_list.lng
- interface/web/admin/lib/lang/cz_language_add.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_language_add.lng
- interface/web/admin/lib/lang/cz_language_complete.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_language_complete.lng
- interface/web/admin/lib/lang/cz_language_edit.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_language_edit.lng
Loading
Please register or sign in to comment