Skip to content
Commit b6e2118b authored by qschejb's avatar qschejb
Browse files

Merge branch 'master' of gitlab.fi.muni.cz:irtis/irtis-data-collector 

# Conflicts:
#	app/src/main/java/cz/muni/irtis/datacollector/persistence/PersistentService.java
parents acb15ee5 a1e8013c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment