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

Merge branch 'better_merge-mc16d-into-21.0' into '21.0' 

merge of 21.0-mc16d (based on 21.0.53) into 21.0: split per commit

See merge request atlas/athena!7459

Former-commit-id: 9201ecf2638e7eedbeb8faa07d0c587bad6539d0
parents 1d326f80 170824fd
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 640 additions and 579 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