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

Merge branch 'master' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-master 

Conflicts:
	interface/lib/lang/es.lng
parents 47568c88 5dc7c8f6
Show whitespace changes
Inline Side-by-side
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