Merge branch 'stable-3.1' into 'stable-3.1'
# Conflicts: # install/sql/incremental/upd_dev_collection.sql
No related branches found
No related tags found
Showing
- install/dist/lib/fedora.lib.php 6 additions, 17 deletionsinstall/dist/lib/fedora.lib.php
- install/lib/install.lib.php 8 additions, 8 deletionsinstall/lib/install.lib.php
- install/sql/incremental/upd_dev_collection.sql 3 additions, 0 deletionsinstall/sql/incremental/upd_dev_collection.sql
- install/sql/ispconfig3.sql 0 additions, 1 deletioninstall/sql/ispconfig3.sql
- install/tpl/apache_apps.vhost.master 4 additions, 12 deletionsinstall/tpl/apache_apps.vhost.master
- install/tpl/server.ini.master 0 additions, 1 deletioninstall/tpl/server.ini.master
- interface/lib/classes/system.inc.php 12 additions, 0 deletionsinterface/lib/classes/system.inc.php
- interface/lib/classes/tform_base.inc.php 39 additions, 16 deletionsinterface/lib/classes/tform_base.inc.php
- interface/web/admin/form/server_config.tform.php 0 additions, 9 deletionsinterface/web/admin/form/server_config.tform.php
- interface/web/admin/lib/lang/ar_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/ar_server_config.lng
- interface/web/admin/lib/lang/bg_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/bg_server_config.lng
- interface/web/admin/lib/lang/br_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/br_server_config.lng
- interface/web/admin/lib/lang/ca_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/ca_server_config.lng
- interface/web/admin/lib/lang/cz_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/cz_server_config.lng
- interface/web/admin/lib/lang/de_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/de_server_config.lng
- interface/web/admin/lib/lang/dk_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/dk_server_config.lng
- interface/web/admin/lib/lang/el_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/el_server_config.lng
- interface/web/admin/lib/lang/en_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/en_server_config.lng
- interface/web/admin/lib/lang/es_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/es_server_config.lng
- interface/web/admin/lib/lang/fi_server_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/fi_server_config.lng
Loading
Please register or sign in to comment