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

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

# Conflicts:
#	.travis.yml
#	meta/main.yml
#	molecule.yml
#	tasks/main.yml
#	tests/playbook.yml
parents eb7feb63 681cd09f
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