JG-Cody 7f1460ffa7 Merge remote-tracking branch 'origin/zwicki_branch' ...

# Conflicts:
#	app/src/main/java/de/jg_cody/Teraplex/ui/Flur/FlurFragment.java

2021-06-27 16:32:00 +02:00

..

src

Merge remote-tracking branch 'origin/zwicki_branch'

2021-06-27 16:32:00 +02:00

.gitignore

hi

2021-03-04 21:18:38 +01:00

build.gradle

dynamic content update

2021-06-12 16:21:13 +02:00

proguard-rules.pro

hi

2021-03-04 21:18:38 +01:00