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

Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/ansible-role-example 

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