Ste74 dbc6b07cd4 Correct conflicts in gnome profiles already corrected in 17.1 branch ... Signed-off-by: Ste74 <stefano@manjaro.org>		2018-07-03 21:59:42 +02:00
..
gnome	Correct conflicts in gnome profiles already corrected in 17.1 branch	2018-07-03 21:59:42 +02:00
kde	[kde] use falkon for minimal	2018-07-03 21:14:47 +02:00
xfce	Merge v17.1 branch into manjaro-architect branch	2018-07-01 19:01:32 +02:00