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
..
artifacts	Merge remote-tracking branch 'origin/master'	2019-10-11 15:06:00 +02:00
libraries	mqttfertig	2019-10-11 15:05:31 +02:00
.gitignore	mqttfertig	2019-10-11 15:05:31 +02:00
$PRODUCT_WORKSPACE_FILE$	moved website folder	2019-10-11 11:17:06 +02:00
misc.xml	mqttfertig	2019-10-11 15:05:31 +02:00
modules.xml	mqttfertig	2019-10-11 15:05:31 +02:00
uiDesigner.xml	mqttfertig	2019-10-11 15:05:31 +02:00
vcs.xml	mqttfertig	2019-10-11 15:05:31 +02:00