Merge 10.4 into 10.5

0459d2cc · Marko Mäkelä · 22cd3358 · 2b3423c4 · 0459d2cc · d204e831
Commit 0459d2cc authored Jan 17, 2023 by Marko Mäkelä
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

CREDITS CREDITS +0 -2

libmariadb libmariadb +1 -1

No files found.
--- a/CREDITS
+++ b/CREDITS
@@ -9,10 +9,8 @@ MariaDB Corporation		https://www.mariadb.com  (2013)
 Microsoft			https://microsoft.com/ (2017)
 ServiceNow			https://servicenow.com (2019)
 SIT				https://sit.org (2022)
-Tencent Cloud			https://cloud.tencent.com (2017)
 Development Bank of Singapore   https://dbs.com (2016)
 IBM				https://www.ibm.com (2017)
-Visma                           https://visma.com (2015)
 Automattic			https://automattic.com (2019)
 Galera Cluster			https://galeracluster.com (2020)
 Percona				https://www.percona.com (2018)

--- a/libmariadb @ d204e831
+++ b/libmariadb @ d204e831
-Subproject commit 7fdb3eab66384a355475704332d11cc1ab82499a
+Subproject commit d204e83104222844251b221e9be7eb3dd9f8d63d