Skip to content
Snippets Groups Projects
Commit 8b993669 authored by Antoine Roy's avatar Antoine Roy
Browse files

Merge branch 'master' into 'correction'

# Conflicts:
#   config.toml
parents 2878cf19 2657fec5
Branches
Tags
1 merge request!1intégration du nouveau mode doks
Pipeline #1490 canceled