Skip to content
Snippets Groups Projects
Commit 59cd5605 authored by aringot's avatar aringot
Browse files

Merge branch 'develop' into feat-fixesBeforeReleaseOne

# Conflicts:
#	SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java
parents c8efc204 057f21a8
Loading
Showing
with 470 additions and 111 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment