Skip to content
Snippets Groups Projects
Commit 26651216 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Merge branch 'develop' into 'production' 

merge develop into production

See merge request !228
parents 567f18db 0316d31b
No related branches found
No related tags found
2 merge requests!393Draft: Support QEmu local grid - DO NOT MERGE,!228merge develop into production
Pipeline #1600 failed
Stage: build
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 508 additions and 29 deletions
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