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

Merge branch 'convert_to_reseller' into 'master' 

Convert to reseller

Fixes FS#925 http://bugtracker.ispconfig.org/index.php?do=details&task_id=925

See merge request !117
parents c0914f82 7e509f5a
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