Skip to content
  • Marius Cramer's avatar
    Merge remote-tracking branch 'origin/stable-3.0.5' · f1634087
    Marius Cramer authored
    Conflicts:
    	interface/web/admin/lib/lang/se_remote_action.lng
    	interface/web/admin/lib/lang/se_system_config.lng
    	interface/web/dashboard/lib/lang/se_dashlet_limits.lng
    	interface/web/mail/lib/lang/se_mail_domain.lng
    	interface/web/monitor/lib/lang/se.lng
    	interface/web/sites/lib/lang/se_web_aliasdomain.lng
    	interface/web/sites/lib/lang/se_web_domain_list.lng
    	interface/web/sites/lib/lang/se_web_subdomain.lng
    	interface/web/sites/lib/lang/se_web_subdomain_list.lng
    	interface/web/sites/lib/lang/se_web_vhost_domain.lng
    	interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
    	interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
    	server/mods-available/rescue_core_module.inc.php
    	server/plugins-available/cron_plugin.inc.php
    f1634087