Timo Volkmann 9e132b21ef Merge branch 'develop' into frontend/timo; weird merge conflicts ... # Conflicts: # .idea/modules.xml # src/main/java/hhn/labsw/bugageocaching/controller/Controller.java		2019-04-30 15:39:50 +02:00
frontend	Merge branch 'develop' into frontend/timo; weird merge conflicts	2019-04-30 15:39:50 +02:00
gradle/wrapper	Merged Branches	2019-03-21 12:37:40 +01:00
src	Merge branch 'develop' into frontend/timo; weird merge conflicts	2019-04-30 15:39:50 +02:00
.gitignore	cleaned repository	2019-04-11 12:17:30 +02:00
BuGaGeocaching.iml	Updated build.gradle	2019-03-17 14:31:25 +01:00
BuGaGeocaching.ipr	Updated build.gradle	2019-03-17 14:31:25 +01:00
build.gradle	Fixed RankingPoints Vue	2019-04-26 19:38:58 +02:00
gradlew	Added project structure	2019-03-17 14:01:39 +01:00
gradlew.bat	Added project structure	2019-03-17 14:01:39 +01:00