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

Merge branch 'stable' 

Conflicts:
	src/lua/bsdsocket.cc
	test/lib/tarantool_preprocessor.py
parents fc7259a4 436cad74
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