Commit ee2439e3 authored by Christian Kniss's avatar Christian Kniss

Merge branch 'master' into 'develop'

# Conflicts:
#   build.gradle
parents 6432993e 700ebdba
Pipeline #2984 passed with stage
in 1 minute and 2 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