Thomas f219b6ef24 Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # app/src/main/res/values-vi/strings.xml		2022-06-22 15:38:12 +02:00
..
src	Merge remote-tracking branch 'origin/develop' into develop	2022-06-22 15:38:12 +02:00
.gitignore	first commit	2022-04-27 15:20:42 +02:00
build.gradle	ViewPager2 - MainActivity	2022-06-22 11:01:39 +02:00
proguard-rules.pro	first commit	2022-04-27 15:20:42 +02:00