Skip to content
Commit d8b2a2e6 authored by Michal Schejbal's avatar Michal Schejbal
Browse files

Merge branch 'issue_76'

# Conflicts:
#	app/src/main/java/cz/muni/irtis/datacollector/lite/gui/questionnaires/database/repository/QuestionnairesRepository.java
#	app/src/main/res/values-cs/strings_questionnaires.xml
#	app/src/main/res/values/strings_questionnaires.xml
parents 8ee9bd93 a0d521a7
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