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

Merge branch 'stable' 

Conflicts:
	doc/user/configuration-reference.xml
	doc/user/connectors.xml
	doc/user/errcode.xml
	doc/user/space.xml
	doc/user/stored-procedures.xml
	doc/user/target.db
	src/box/space.cc
parents deb3b396 b0f2c9be
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 783 additions and 338 deletions
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