Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
No related branches found
No related tags found
Showing
- install/sql/incremental/upd_dev_collection.sql 6 additions, 0 deletionsinstall/sql/incremental/upd_dev_collection.sql
- install/sql/ispconfig3.sql 2 additions, 2 deletionsinstall/sql/ispconfig3.sql
- install/tpl/apache_apps.vhost.master 0 additions, 8 deletionsinstall/tpl/apache_apps.vhost.master
- install/tpl/apache_ispconfig.conf.master 25 additions, 0 deletionsinstall/tpl/apache_ispconfig.conf.master
- install/tpl/apache_ispconfig.vhost.master 0 additions, 26 deletionsinstall/tpl/apache_ispconfig.vhost.master
- install/tpl/system.ini.master 0 additions, 1 deletioninstall/tpl/system.ini.master
- interface/lib/classes/tform_base.inc.php 43 additions, 18 deletionsinterface/lib/classes/tform_base.inc.php
- interface/lib/plugins/mail_user_filter_plugin.inc.php 45 additions, 23 deletionsinterface/lib/plugins/mail_user_filter_plugin.inc.php
- interface/web/admin/form/system_config.tform.php 0 additions, 6 deletionsinterface/web/admin/form/system_config.tform.php
- interface/web/admin/lib/lang/ar_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/ar_system_config.lng
- interface/web/admin/lib/lang/bg_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/bg_system_config.lng
- interface/web/admin/lib/lang/br_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/br_system_config.lng
- interface/web/admin/lib/lang/ca_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/ca_system_config.lng
- interface/web/admin/lib/lang/cz_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/cz_system_config.lng
- interface/web/admin/lib/lang/de_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/de_system_config.lng
- interface/web/admin/lib/lang/dk_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/dk_system_config.lng
- interface/web/admin/lib/lang/el_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/el_system_config.lng
- interface/web/admin/lib/lang/es_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/es_system_config.lng
- interface/web/admin/lib/lang/fi_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/fi_system_config.lng
- interface/web/admin/lib/lang/fr_system_config.lng 0 additions, 1 deletioninterface/web/admin/lib/lang/fr_system_config.lng
Loading
Please register or sign in to comment