Skip to content
Snippets Groups Projects
Commit 75b406b2 authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska
Browse files

Merge branch '21.6' into '21.6-jetrec'

# Conflicts:
#   Projects/AthDataQuality/externals.txt
#   Projects/AthDerivation/externals.txt
#   Projects/AthGeneration/externals.txt
#   Projects/AthSimulation/externals.txt
#   Projects/Athena/externals.txt
#   Projects/AthenaP1/externals.txt
parents a2cb2553 a6965bba
No related branches found
No related tags found
No related merge requests found
Showing
with 1438 additions and 248 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment