summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-10-28 15:50:13 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-10-28 15:50:13 -0400
commit5db2195a35c0a2ee7703ab603721b2f0987d2585 (patch)
tree1306ce565f0f01f56dd31b2c43b1233bcb08257c /CREDITS
parentc9ded859a6fad25fc513d3a0c7d17f826e567691 (diff)
parenteca8c324e9a02f530853580991b11b587f54b24a (diff)
downloadmariadb-git-5db2195a35c0a2ee7703ab603721b2f0987d2585.tar.gz
Merge tag 'mariadb-10.0.28' into 10.0-galera
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS1
1 files changed, 1 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index f0e6de7f08f..35ab4d48a8f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -10,6 +10,7 @@ Visma http://visma.com (2015 - 2016)
Acronis http://acronis.com (2016)
Nexedi https://www.nexedi.com (2016)
Automattic https://automattic.com (2014 - 2016)
+Tencent Game DBA http://tencentdba.com/about (2016)
Verkkokauppa.com https://www.verkkokauppa.com (2015 - 2016)
Virtuozzo https://virtuozzo.com (2016)