tree 888b75ae8870f88f13fa9184f6a835ae1cc6703a
parent 099efd0cf5d0de716dc1574a3b00516cd3b38b4d
parent 275e6edd26f1ff8803183f6568e5d65f69e19291
author Michael Rudolf <mru@bsi-software.com> 1588658285 +0200
committer Michael Rudolf <mru@bsi-software.com> 1588665858 +0200

Merge remote-tracking branch 'remotes/origin/releases/7.0.x' into
releases/8.0.x