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

..

unnamed.xml

mqttfertig

2019-10-11 15:05:31 +02:00

WasteInformationServer_jar.xml

mqttfertig

2019-10-11 15:05:31 +02:00

WasteinformationServer.xml

moved website folder

2019-10-11 11:17:06 +02:00