4 Commits

Author	SHA1	Message	Date
karoel2	a6afe30b7f	Resolve merges	2022-06-15 10:51:36 +02:00
karoel2	c2a9619ac7	Fixed merge conflict	2022-06-15 09:21:42 +02:00
Jakub Adamski	ac0a3417da	fixes	2022-06-15 00:02:44 +02:00
Jakub Adamski	ca37786161	rename-system	2022-06-14 22:26:42 +02:00