Skip to content
Snippets Groups Projects
Commit 1f22653d authored by Christophe Simonis's avatar Christophe Simonis
Browse files

[MERGE] saas-6 forward-port 

Rebasing a merge commit with a lot of conflicts is a real pain as every
non-automatic conflicts should be redo manually (especially when there
is a lot of file rename that git cannot follow)
parents 92583db0 fe2b5f35
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 658 additions and 615 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment