Sam Spycher 71b8ef176f Merge branch 'omnipod_eros_dev' into tbr_duration_validation ... # Conflicts: # omnipod/src/main/res/values-de-rDE/strings.xml		2020-10-21 16:11:32 +02:00
..
src	Merge branch 'omnipod_eros_dev' into tbr_duration_validation	2020-10-21 16:11:32 +02:00
.gitignore	WIP on moving Omnipod to a separate module	2020-08-16 23:54:41 +02:00
build.gradle	firebase libs update	2020-10-19 22:42:26 +02:00
consumer-rules.pro	WIP on moving Omnipod to a separate module	2020-08-16 23:54:41 +02:00
proguard-rules.pro	WIP on moving Omnipod to a separate module	2020-08-16 23:54:41 +02:00