Commit a7479b22 authored by PICHOU Kyâne's avatar PICHOU Kyâne
Browse files

Merge branch 'master' into 'checkmk'

# Conflicts:
#   framadate/Dockerfile
#   mattermost/README.md
#   mattermost/app/Dockerfile
#   mattermost/docker-compose.yml
#   mattermost/web/Dockerfile
#   mattermost/web/entrypoint.sh
#   mattermost/web/mattermost
#   mattermost/web/mattermost-ssl
#   pica-backup/postgres-run.sh
parents 1e982e59 20f36951
Supports Markdown
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