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

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

Conflicts:
	test/box-tap/cfg.result
	test/box-tap/cfg.test.lua
parents f1c8c60f b2ee33bd
No related branches found
No related tags 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