Merge branch 'master' into 'IT20168186_Health_Monitoring'
# Conflicts: # app/src/main/res/layout/activity_home.xml
Showing
app/.idea/.gitignore
0 → 100644
app/.idea/gradle.xml
0 → 100644
app/.idea/misc.xml
0 → 100644
app/.idea/vcs.xml
0 → 100644
Please register or sign in to comment