Skip to content
Snippets Groups Projects
Commit ddac962fa287 authored by Georges Racinet's avatar Georges Racinet :squid:
Browse files

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
No related merge requests found
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