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

Merge remote-tracking branch 'origin/gh-528-different-types-in-update-v3' into... 

Merge remote-tracking branch 'origin/gh-528-different-types-in-update-v3' into gh-528-different-types-in-update-v2

Conflicts:
	src/box/tuple_update.cc
	test/box/update.result
parents ce60e84b cdd69575
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