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

Merge remote-tracking branch 'origin/gh-318-box-raise-error-v2' 

Conflicts:
	src/box/lua/call.cc
	src/lua/box_net_box.lua
	test/box/call.result
	test/box/misc.result
parents 4b354a87 4cc03606
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 271 additions and 155 deletions
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