Skip to content
Snippets Groups Projects
Commit 82c6d49d authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Merge branch 'master' into 1.6 

Conflicts:
	.gitmodules
parents 985d9fa0 b8fdd95b
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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