Skip to content
Commit f1634087 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge remote-tracking branch 'origin/stable-3.0.5'

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
parents 306c962f 1deddf54
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment