shpuld 0ab828bb30 Merge develop and fix conflict		2019-01-26 17:50:41 +02:00
..
status.js	Merge develop and fix conflict	2019-01-26 17:50:41 +02:00
status.vue	Merge develop and fix conflict	2019-01-26 17:50:41 +02:00