Commit 4b9cf417 authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   composer.lock
parents 1e1a5351 df216a11
Pipeline #1951 passed with stages
in 2 minutes and 32 seconds
Markdown is supported
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