Skip to content
Snippets Groups Projects
Commit 15c36e44 authored by Tamara Vazquez Schroeder's avatar Tamara Vazquez Schroeder
Browse files

Merge branch 'cherry-pick-49472b64-2' into '21.0-mc16d' 

Merge branch '21.0-JVC-fix' into '21.0-mc16d'

See merge request atlas/athena!6893

Former-commit-id: e6b7d017f0a76d6d144d3500f2d243ac4af6fcaa
parents 915d1c7e de36bef0
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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