4 commits

Author	SHA1	Message	Date
schaeff	8f5e4d9985	fix conflicts	2022-07-04 19:50:12 +02:00
schaeff	6fd88653ee	merge dev	2022-05-31 18:04:30 +02:00
schaeff	6d566481f1	fix zjs	2022-05-13 16:01:29 +02:00
schaeff	ed04267a9a	complete refactor	2022-05-13 12:34:05 +02:00