Skip to content
Snippets Groups Projects
Commit 6c94043f authored by Christian Kniss's avatar Christian Kniss
Browse files

Merge branch 'develop'

# Conflicts:
#	build.gradle
parents 4030ac1e de4b2fed
Branches master
Tags v1.1.6
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment