Conflicts: software/erp5/software.cfg Resolved by accepting upstream version.
Attach a file by drag & drop or click to upload
Romain Courteaud authored