Skip to content
Snippets Groups Projects
Commit 1ffa84e3 authored by Christian Elberfeld's avatar Christian Elberfeld
Browse files

Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone

# Conflicts:
#	common/borgbackup/tasks/main.yml
#	common/borgbackup/templates/borgbackup-check.sh
#	common/borgbackup/templates/borgbackup-create.sh
#	common/borgbackup/templates/borgbackup-delete.sh
#	common/borgbackup/templates/borgbackup-info.sh
#	common/borgbackup/templates/borgbackup-init.sh
#	common/borgbackup/templates/borgbackup-list.sh
#	common/borgbackup/templates/borgbackup-mount.sh
#	common/borgbackup/templates/borgbackup-prometheus.sh
parents 0d4b22a0 a579ea37
No related branches found
No related tags found
No related merge requests found
Showing
with 452 additions and 59 deletions
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