Skip to content
Commit 14a97553 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch '16-options' into 'master' 

Resolve "support control panel master node"

Closes #16

See merge request !82
parents bfa9e6ba d3cfbb9d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment