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

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

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	interface/lib/config.inc.php
	interface/web/admin/lib/lang/de_system_config.lng
parents ba5d8315 b34f99da
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