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

Merge branch 'feature_82'

# Conflicts:
#	app/src/main/java/cz/muni/irtis/datacollector/lite/gui/questionnaires/QuestionnairesFragment.java
#	app/src/main/res/values-cs/strings_questionnaires.xml
#	app/src/main/res/values/strings_questionnaires.xml
parents d6cb6663 62bc694c
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