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

Merge branch 'stable' 

Conflicts:
	src/lua/init.cc
	test/box/fiber.result
	test/box/fiber.test
parents 64d90c35 3a9f44f2
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