Thomas fd400f025e Merge branch 'donation_google' into develop ... # Conflicts: # .gitignore		2021-01-08 17:45:00 +01:00
..
src	Merge branch 'donation_google' into develop	2021-01-08 17:45:00 +01:00
.gitignore	Initial commit	2020-06-25 16:57:13 +02:00
build.gradle	Some changes	2021-01-06 19:23:44 +01:00
proguard-rules.pro	some changes	2020-06-26 18:17:17 +02:00