Bernhard Landauer 956894406a resolve conflict		2019-12-15 01:19:04 +01:00
..
gnome	Sync with master [gnome]	2019-07-11 23:00:56 +02:00
kde	resolve conflict	2019-12-15 01:19:04 +01:00
xfce	resolve conflict	2019-12-15 01:19:04 +01:00