Skip to content
Commit c559cbb4 authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' of https://www.shore.co.il/git/ansible-role-example 

# Conflicts:
#	meta/main.yml
#	molecule.yml
#	tasks/main.yml
#	tests/test_example.py
parents 98b47b3b bd2a4293
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