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

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

Merge gh-90.

Conflicts:
	client/tarantool/tc.c
	client/tarantool/tc_query.c
parents 4fbae982 9af28f9f
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