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

Merge branch Bug#702399 into master-stable. 

Conflicts:
	include/iproto.h
	test/box/protocol.c
	test/box/protocol.result
parents cab962b6 34fd4a71
No related branches found
No related tags found
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