Commit Graph

3 Commits

Author SHA1 Message Date
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
Gregor_Dutzler
94c96d04ef mqttfertig 2019-10-11 15:05:31 +02:00
dfd3cff5a2 moved website folder 2019-10-11 11:17:06 +02:00