Skip to content

Manual upstream merge

Georges Racinet requested to merge topic/heptapod/ee-extraction into branch/heptapod

Part of #689 (closed), we're climbing from the 14.10 branching point to the 15.0 branching point, singleing out each source of conflict.

Merge request reports