Merge 10.4 into 10.5

MariaDB · Jan 17, 2023 · 0459d2c · 0459d2c
2 parents 22cd335 + 2b3423c
commit 0459d2c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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)

diff --git a/libmariadb b/libmariadb