Skip to content

2022-08-27: merge of 22.0 into master

Johannes Elmsheuser requested to merge elmsheus/athena:update_27_08_2 into master

Daily sweep/merge of 22.0 branch into master branch for 2022-08-27.

Used git merge --strategy-option theirs upstream/22.0 to give preference to the 22.0 branch code in merge conflicts of:

Edited by Johannes Elmsheuser

Merge request reports