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

Merge branch 'stable' 

Conflicts:
	src/box/box_lua.m
	src/lua/init.m
	test/box/lua.result
parents 58d23f42 6fde6562
No related branches found
No related tags 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