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

Merge branch 'stable' into gh-100-rows-per-val 

Conflicts:
	test/box/configuration.result
	test/box/configuration.test
parents 76914b12 f331a806
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