Merge branch 'stable-3.1' into 'add-some-translations'
# Conflicts: # interface/web/admin/form/users.tform.php
Showing
- CONTRIBUTING.md 1 addition, 1 deletionCONTRIBUTING.md
- install/dist/tpl/gentoo/jk_init.ini.master 2 additions, 0 deletionsinstall/dist/tpl/gentoo/jk_init.ini.master
- install/lib/installer_base.lib.php 6 additions, 17 deletionsinstall/lib/installer_base.lib.php
- install/sql/README.txt 8 additions, 11 deletionsinstall/sql/README.txt
- install/sql/incremental/upd_dev_collection.sql 12 additions, 0 deletionsinstall/sql/incremental/upd_dev_collection.sql
- install/sql/ispconfig3.sql 6 additions, 0 deletionsinstall/sql/ispconfig3.sql
- install/tpl/jk_init.ini.master 2 additions, 0 deletionsinstall/tpl/jk_init.ini.master
- install/tpl/security_settings.ini.master 0 additions, 0 deletionsinstall/tpl/security_settings.ini.master
- install/tpl/server.ini.master 1 addition, 0 deletionsinstall/tpl/server.ini.master
- install/tpl/system.ini.master 1 addition, 0 deletionsinstall/tpl/system.ini.master
- interface/lib/classes/aps_guicontroller.inc.php 2 additions, 0 deletionsinterface/lib/classes/aps_guicontroller.inc.php
- interface/lib/classes/custom_datasource.inc.php 4 additions, 3 deletionsinterface/lib/classes/custom_datasource.inc.php
- interface/lib/classes/ispcmail.inc.php 6 additions, 3 deletionsinterface/lib/classes/ispcmail.inc.php
- interface/lib/classes/listform_actions.inc.php 2 additions, 1 deletioninterface/lib/classes/listform_actions.inc.php
- interface/lib/classes/plugin_backuplist.inc.php 56 additions, 1 deletioninterface/lib/classes/plugin_backuplist.inc.php
- interface/lib/classes/remote.d/sites.inc.php 6 additions, 2 deletionsinterface/lib/classes/remote.d/sites.inc.php
- interface/lib/classes/sites_database_plugin.inc.php 4 additions, 2 deletionsinterface/lib/classes/sites_database_plugin.inc.php
- interface/lib/classes/system.inc.php 12 additions, 0 deletionsinterface/lib/classes/system.inc.php
- interface/lib/lang/fi.lng 0 additions, 0 deletionsinterface/lib/lang/fi.lng
- interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php 6 additions, 2 deletionsinterface/lib/plugins/sites_web_vhost_domain_plugin.inc.php
Loading
Please register or sign in to comment