Skip to content
Commit f0b03be2 authored by Florian Schaal's avatar Florian Schaal
Browse files

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

Conflicts:
	interface/web/client/form/reseller.tform.php
parents bad4bd31 a713050f
Hide 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