Skip to content
Snippets Groups Projects
Commit 56a3a150 authored by Mayr, Hannes's avatar Mayr, Hannes
Browse files

Resolve merge conflicts.

parents 77140c51 439481cb
Branches
Tags v1.11.0
3 merge requests!65Release v0.3.0,!64New year developments,!63Improve handling of long IDs
Pipeline #888227 passed