Skip to content
Snippets Groups Projects
Commit 9585aa95 authored by Florent Lavelle's avatar Florent Lavelle
Browse files

fix conflicts

parents 7d433196 206012c3
No related branches found
No related tags found
2 merge requests!295Version 3.0.0,!257REDMINE_ISSUE-12843
This commit is part of merge request !257. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 563 additions and 220 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