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

Merge remote-tracking branch 'origin/stable' 

Conflicts:
	src/box/box.cc
	test/box/configuration.test
parents caf81834 51704ad2
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