Skip to content
GitLab
Commit 3f0d5341 authored by Игорь Федоров's avatar Игорь Федоров 🔥
Browse files

Merge branch 'master' into 'myBranch' 

# Conflicts:
#   addnewtestwidget.cpp
#   deletetestwidget.cpp
parents c1f11023 c0091434
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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