Commit graph

5 commits

Author SHA1 Message Date
Rémy Coutable
a51dea0d43
Improve doc/development/automatic_ce_ee_merge.md
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-01 13:37:47 +01:00
Ville Skyttä
0cbbb08e79 doc: Spelling fixes 2018-01-19 12:09:59 +02:00
Rémy Coutable
b79a878d11
Remove a header level in the new 'Automatic CE->EE merge' doc
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-11 12:30:07 +01:00
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