Commit 7087b1c2 authored by Daniel Wolf's avatar Daniel Wolf

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle
parents c39a5759 16511e71
Pipeline #7557 passed with stage
in 4 minutes and 2 seconds