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

Merge branch 'master' into 1.6 

Conflicts:
	src/box/lua/tuple.lua
	test/big/lua.result
	test/big/lua.test.lua
parents bb83fc50 037bedf0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 181 additions and 55 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