Merge branch 'develop' into '6497_php_sort_version_3'
# Conflicts: # install/sql/incremental/upd_dev_collection.sql
No related branches found
No related tags found
Showing
- install/sql/incremental/upd_dev_collection.sql 5 additions, 0 deletionsinstall/sql/incremental/upd_dev_collection.sql
- install/sql/ispconfig3.sql 1 addition, 1 deletioninstall/sql/ispconfig3.sql
- install/tpl/postfix_3-0.conf.master 3 additions, 0 deletionsinstall/tpl/postfix_3-0.conf.master
- install/tpl/server.ini.master 2 additions, 0 deletionsinstall/tpl/server.ini.master
- interface/lib/classes/tform_base.inc.php 15 additions, 5 deletionsinterface/lib/classes/tform_base.inc.php
- interface/web/admin/form/server_config.tform.php 24 additions, 0 deletionsinterface/web/admin/form/server_config.tform.php
- interface/web/admin/form/system_config.tform.php 6 additions, 0 deletionsinterface/web/admin/form/system_config.tform.php
- interface/web/admin/lib/lang/ar_server_config.lng 7 additions, 0 deletionsinterface/web/admin/lib/lang/ar_server_config.lng
- interface/web/admin/lib/lang/ar_system_config.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/ar_system_config.lng
- interface/web/admin/lib/lang/bg_server_config.lng 7 additions, 0 deletionsinterface/web/admin/lib/lang/bg_server_config.lng
- interface/web/admin/lib/lang/bg_system_config.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/bg_system_config.lng
- interface/web/admin/lib/lang/br_server_config.lng 7 additions, 0 deletionsinterface/web/admin/lib/lang/br_server_config.lng
- interface/web/admin/lib/lang/br_system_config.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/br_system_config.lng
- interface/web/admin/lib/lang/ca_server_config.lng 7 additions, 0 deletionsinterface/web/admin/lib/lang/ca_server_config.lng
- interface/web/admin/lib/lang/ca_system_config.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/ca_system_config.lng
- interface/web/admin/lib/lang/cz_server_config.lng 7 additions, 0 deletionsinterface/web/admin/lib/lang/cz_server_config.lng
- interface/web/admin/lib/lang/cz_system_config.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/cz_system_config.lng
- interface/web/admin/lib/lang/de_server_config.lng 7 additions, 0 deletionsinterface/web/admin/lib/lang/de_server_config.lng
- 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/dk_server_config.lng 7 additions, 0 deletionsinterface/web/admin/lib/lang/dk_server_config.lng
Loading
Please register or sign in to comment