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

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

Conflicts:
	.gitmodules
parents a0852b53 42baf348
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 721 additions and 111 deletions
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