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

Merge branch 'master' into 'correction' 

# Conflicts:
#   config.toml
parents a6e27716 5f45615d
No related branches found
No related tags found
Checking pipeline status
Show whitespace changes
Inline Side-by-side
Showing
with 4 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment