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

Merge remote-tracking branch 'origin/1.6' into 1.7

Conflicts:
	src/box/lua/schema.lua
parents ceb32e1e e5676db4
No related branches found
No related tags found
No related merge requests found
Showing
with 429 additions and 586 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment