2022-06-24: daily merge of 22.0 into master (!54512) · Merge requests · atlas / athena · GitLab

GitLab jobs artifacts no longer stored forever as of Monday, November 4th 08:30h. Further information under https://cern.ch/otg0152576

Adam Edward Barton requested to merge abarton/athena:22tomaster_24Jun into master Jun 24, 2022

Trivial conflict in LArFEBMonAlg.h