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

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

# Conflicts:
#	.pre-commit-config.yaml
#	meta/main.yml
#	molecule.yml
#	tasks/main.yml
#	tests/playbook.yml
#	tests/requirements.yml
parents 5366d12a 2d8e8d93
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment