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

Merge branch 'develop' into 'master'

Update MASTER for 2.4.2

See merge request !1421
parents 51d3d8d2 756f7bf7
No related branches found
Tags 2.4.2
2 merge requests!1712fix master/develop merge conflicts,!1421Update MASTER for 2.4.2
Pipeline #38623 passed
Showing
with 299 additions and 30 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