2 Commits

Author	SHA1	Message	Date
Rémy Coutable	dd0223f530	Address Robert's and Axil's feedback ... Signed-off-by: Rémy Coutable <remy@rymai.me>	2017-12-06 16:30:03 +01:00
Rémy Coutable	aaf1699730	Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge" ... Signed-off-by: Rémy Coutable <remy@rymai.me>	2017-12-05 17:49:49 +01:00