Skip to content
Snippets Groups Projects
Commit 60c69be1 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge remote-tracking branch 'origin/1.6' into 1.7

parents d04729bc 504e1516
No related merge requests found
Showing
with 132 additions and 139 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