Oskar Kapala 5ff4ddc2c9 Resolve merge conflicts		2026-05-12 17:34:42 +02:00
..
database.json	Resolve merge conflicts	2026-05-12 17:34:42 +02:00
homeassistant.json	Resolve merge conflicts	2026-05-12 17:34:42 +02:00