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

Merge branch 'stable' of /home/kostja/work/tarantool-stable 

Merge gh-91, gh-118

Conflicts:
	src/box/tuple.cc
parents 48475d12 1a69fd69
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