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

Merge branch 'develop' into 'production' 

merge develop into production

See merge request !278
parents b694712e 282d1356
No related branches found
No related tags found
2 merge requests!393Draft: Support QEmu local grid - DO NOT MERGE,!278merge develop into production
Pipeline #1935 passed
Stage: build
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 136 additions and 140 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