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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment