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

Merge branch 'stable'

Conflicts:
	test/box/lua.result
	test/box/lua.test
	test/lib/sql_ast.py
parents 525c3f1d 8e8cd061
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment