Commit 649053d2 authored by Christian Kniss's avatar Christian Kniss

Merge branch 'master' into 'develop'

# Conflicts:
#   build.gradle
parents eaf92923 9bc0fdf4
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