Skip to content
Snippets Groups Projects
Commit 2c97cb5f authored by Simon Malesys's avatar Simon Malesys
Browse files

Merge branch 'master' into 'update-frontend'

# Conflicts:
#   .gitlab-ci.yml
parents bad27754 18f81184
No related branches found
No related tags found
No related merge requests found
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