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

Merge branch 'stable' (fixes gh-43). 

Conflicts:
	test/box/socket.test
parents 2639be18 63168189
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