Skip to content
Snippets Groups Projects
Commit 7e244198 authored by Domenico Giordano's avatar Domenico Giordano
Browse files

Merge branch 'qa' into 'BMK-192' 

# Conflicts:
#   build-executor/image/Dockerfile
#   common/json-differ.py
parents 35d8da5c 823e78b7
No related branches found
No related tags found
1 merge request!243including parsing tests, changing json format
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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