Commit 377ec1b5 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Merge branch '10.5' into 10.6

# Conflicts:
#	sql/sql_connect.cc
parents 2a4bd038 faee972f
Markdown is supported
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