Skip to content
Commit 10fbc8a2 authored by mriedl's avatar mriedl
Browse files

Merge branch 'morphemic-rc2.5' into morphemic-rc3.0 

# Conflicts:
#	.gitlab-ci.yml
parents 2dc3edc5 0acaeb20
Pipeline #23280 passed with stages
in 12 minutes and 18 seconds