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

Merge branch 'rc/2.1.1' into 'master'

Update master with 2.1.1

See merge request !1231
parents e768ec1f f31bc531
No related branches found
Tags 2.1.1
2 merge requests!1712fix master/develop merge conflicts,!1231Update master with 2.1.1
Pipeline #30654 passed
Showing
with 296 additions and 65 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