Skip to content
Snippets Groups Projects
Forked from ISPConfig / ISPConfig 3
Source project has a limited visibility.
  • Marius Cramer's avatar
    363ccfed
    Merge remote-tracking branch 'origin/stable-3.0.5' · 363ccfed
    Marius Cramer authored
    Conflicts:
    	interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
    	interface/web/mail/lib/lang/de_mail_get.lng
    	interface/web/sites/lib/lang/de_cron.lng
    	interface/web/sites/lib/lang/en_cron.lng
    	interface/web/sites/web_vhost_subdomain_edit.php
    363ccfed
    History
    Merge remote-tracking branch 'origin/stable-3.0.5'
    Marius Cramer authored
    Conflicts:
    	interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
    	interface/web/mail/lib/lang/de_mail_get.lng
    	interface/web/sites/lib/lang/de_cron.lng
    	interface/web/sites/lib/lang/en_cron.lng
    	interface/web/sites/web_vhost_subdomain_edit.php