Upstream merge with conflicts resolution
The conflict is the one also solved in the 17.0 release branch as 5814b904851d, with the same resolution (mostly revert to Heptapod).
No related branches found
No related tags found
Loading
The conflict is the one also solved in the 17.0 release branch as 5814b904851d, with the same resolution (mostly revert to Heptapod).