Merge tag 'release/21.0.71' into updateTrigMC_to_21.1.28_and.21.0.71 (7e7e447d) · Commits · Lawrence Davou Christopher / athena

Commit 7e7e447d authored 6 years ago by Julie Kirk

Merge tag 'release/21.0.71' into updateTrigMC_to_21.1.28_and.21.0.71

 Conflicts:
	Projects/Athena/version.txt
	Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx


Former-commit-id: d0356fb1e5808e01c74dd84589b8a62495d5456b

parents 5ce4a4ea fdf317ce

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 321 additions and 1037 deletions

Please register or to comment

Admin message

Merge tag 'release/21.0.71' into updateTrigMC_to_21.1.28_and.21.0.71