JG-Cody e401474bf7 Merge branch 'master' of https://github.com/JG-Cody/Terraplex ... Conflicts: app/src/main/java/de/jg_cody/Teraplex/ui/Flur/FlurFragment.java		2021-06-27 17:04:30 +02:00
app	Merge branch 'master' of https://github.com/JG-Cody/Terraplex into zwicki_branch	2021-06-27 16:57:02 +02:00
gradle/wrapper	added Colorpicker	2021-05-31 19:25:14 +02:00
.gitignore	hi	2021-03-04 21:18:38 +01:00
build.gradle	...	2021-05-28 20:57:25 +02:00
gradle.properties	hi	2021-03-04 21:18:38 +01:00
gradlew	hi	2021-03-04 21:18:38 +01:00
gradlew.bat	hi	2021-03-04 21:18:38 +01:00
settings.gradle	Zurück-Button minimiert app	2021-03-29 18:11:32 +02:00
Untitled Diagram.drawio	Update Untitled Diagram.drawio	2021-04-25 12:17:45 +02:00