Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: interface/lib/classes/tform.inc.php interface/web/admin/lib/lang/de_directive_snippets.lng interface/web/dns/dns_import.php interface/web/dns/dns_soa_edit.php interface/web/dns/dns_wizard.php interface/web/mail/mail_domain_edit.php interface/web/sites/database_edit.php interface/web/sites/lib/lang/de_web_domain.lng interface/web/sites/lib/lang/en_web_domain.lng interface/web/sites/web_domain_edit.php server/server.php
Showing
- interface/lib/classes/aps_crawler.inc.php 1 addition, 1 deletioninterface/lib/classes/aps_crawler.inc.php
- interface/lib/classes/aps_guicontroller.inc.php 10 additions, 10 deletionsinterface/lib/classes/aps_guicontroller.inc.php
- interface/lib/classes/auth.inc.php 5 additions, 2 deletionsinterface/lib/classes/auth.inc.php
- interface/lib/classes/client_templates.inc.php 6 additions, 6 deletionsinterface/lib/classes/client_templates.inc.php
- interface/lib/classes/custom_datasource.inc.php 7 additions, 7 deletionsinterface/lib/classes/custom_datasource.inc.php
- interface/lib/classes/db_mysql.inc.php 12 additions, 1 deletioninterface/lib/classes/db_mysql.inc.php
- interface/lib/classes/form.inc.php 2 additions, 0 deletionsinterface/lib/classes/form.inc.php
- interface/lib/classes/plugin_backuplist.inc.php 2 additions, 2 deletionsinterface/lib/classes/plugin_backuplist.inc.php
- interface/lib/classes/tform.inc.php 3 additions, 2 deletionsinterface/lib/classes/tform.inc.php
- interface/lib/classes/tform_actions.inc.php 1 addition, 1 deletioninterface/lib/classes/tform_actions.inc.php
- interface/lib/classes/validate_client.inc.php 1 addition, 1 deletioninterface/lib/classes/validate_client.inc.php
- interface/lib/classes/validate_dns.inc.php 2 additions, 2 deletionsinterface/lib/classes/validate_dns.inc.php
- interface/lib/classes/validate_domain.inc.php 3 additions, 3 deletionsinterface/lib/classes/validate_domain.inc.php
- interface/web/admin/lib/lang/de_directive_snippets.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/de_directive_snippets.lng
- interface/web/admin/lib/lang/en_directive_snippets.lng 1 addition, 0 deletionsinterface/web/admin/lib/lang/en_directive_snippets.lng
- interface/web/admin/login_as.php 1 addition, 1 deletioninterface/web/admin/login_as.php
- interface/web/admin/remote_action_ispcupdate.php 1 addition, 1 deletioninterface/web/admin/remote_action_ispcupdate.php
- interface/web/admin/remote_action_osupdate.php 1 addition, 1 deletioninterface/web/admin/remote_action_osupdate.php
- interface/web/admin/server_edit.php 1 addition, 1 deletioninterface/web/admin/server_edit.php
- interface/web/admin/server_ip_edit.php 1 addition, 1 deletioninterface/web/admin/server_ip_edit.php
Loading
Please register or sign in to comment