Joan Sanchez 768e4d5e77 Resolved conflicts		2022-08-10 12:13:31 +02:00
..
agency	Resolved conflicts	2022-08-10 12:13:31 +02:00
agency-mode	definitions corrected for myOptions of endpoints	2021-11-18 11:17:30 +01:00
zone	Resolved conflicts	2022-08-10 12:13:31 +02:00