Merge branch 'master' into feature_init_process
Conflicts: doc/man/cdist-reference.text.sh Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
commit
18eaa476e4
1 changed files with 4 additions and 4 deletions
Loading…
Reference in a new issue