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
No related branches found
No related tags found
1 merge request!1intégration du nouveau mode doks
Pipeline #1490 canceled
Stage: test
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment