Skip to content
Snippets Groups Projects
Commit cc170aa3 authored by Shpuld Shpludson's avatar Shpuld Shpludson
Browse files

Update master with 2.4.0

parents c3fcbbd9 425919a0
No related branches found
No related tags found
1 merge request!1712fix master/develop merge conflicts
Pipeline #36994 passed
Showing
with 151 additions and 234 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment