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

Merge branch 'develop' into 'staging' 

Merge develop into staging

See merge request !137
parents e28e3427 f7904606
No related branches found
No related tags found
3 merge requests!393Draft: Support QEmu local grid - DO NOT MERGE,!140Merge staging into production,!137Merge develop into staging
Pipeline #896 failed
Stage: build
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 4 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