Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
Showing
- .gitlab-ci.yml 1 addition, 1 deletion.gitlab-ci.yml
- install/sql/incremental/upd_dev_collection.sql 3 additions, 0 deletionsinstall/sql/incremental/upd_dev_collection.sql
- install/sql/ispconfig3.sql 1 addition, 0 deletionsinstall/sql/ispconfig3.sql
- install/tpl/server.ini.master 1 addition, 0 deletionsinstall/tpl/server.ini.master
- interface/lib/classes/auth.inc.php 23 additions, 13 deletionsinterface/lib/classes/auth.inc.php
- interface/web/admin/form/server_config.tform.php 28 additions, 0 deletionsinterface/web/admin/form/server_config.tform.php
- interface/web/admin/lib/lang/ar_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/ar_server_config.lng
- interface/web/admin/lib/lang/bg_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/bg_server_config.lng
- interface/web/admin/lib/lang/br_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/br_server_config.lng
- interface/web/admin/lib/lang/ca_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/ca_server_config.lng
- interface/web/admin/lib/lang/cz_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/cz_server_config.lng
- interface/web/admin/lib/lang/de_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/de_server_config.lng
- interface/web/admin/lib/lang/dk_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/dk_server_config.lng
- interface/web/admin/lib/lang/el_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/el_server_config.lng
- interface/web/admin/lib/lang/en_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/en_server_config.lng
- interface/web/admin/lib/lang/es_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/es_server_config.lng
- interface/web/admin/lib/lang/fi_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/fi_server_config.lng
- interface/web/admin/lib/lang/fr_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/fr_server_config.lng
- interface/web/admin/lib/lang/hr_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/hr_server_config.lng
- interface/web/admin/lib/lang/hu_server_config.lng 4 additions, 0 deletionsinterface/web/admin/lib/lang/hu_server_config.lng
Loading
Please register or sign in to comment