Skip to content
Snippets Groups Projects
Commit 5510c640 authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Merge branch 'stable' 

Conflicts:
	src/box/box_lua.cc
	test/box/lua.result
	test/box/lua.test
parents b85ec626 10459ebe
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