Go to file
Gregor_Dutzler 8810b1dcae Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/.gitignore
#	src/com/wasteinformationserver/main.java
2019-10-11 15:06:00 +02:00
.idea Merge remote-tracking branch 'origin/master' 2019-10-11 15:06:00 +02:00
lib moved website folder 2019-10-11 11:17:06 +02:00
resources/wwwroot moved website folder 2019-10-11 11:17:06 +02:00
src Merge remote-tracking branch 'origin/master' 2019-10-11 15:06:00 +02:00
README.md Initial commit 2019-09-13 13:59:15 +02:00
WasteInformationServer.iml moved website folder 2019-10-11 11:17:06 +02:00

WasteInformationServer