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

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

# Conflicts:
#	tests/playbook.yml
parents c87c59a7 46ba6ecd
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