Commit 01271156 authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'develop' into 'main'

Release 30-11-2020

See merge request t3o/ter!625
parents 001e53e0 34a1901b
Pipeline #10109 passed with stages
in 11 minutes and 56 seconds