Skip to content
Snippets Groups Projects
Commit eb5eb9a4 authored by alexander.lysikov's avatar alexander.lysikov
Browse files

resolve conflict with master

parent ade84d88
No related branches found
No related tags found
1 merge request!33Feature 2618
Hide whitespace changes
Inline Side-by-side
Showing
with 20 additions and 5 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