Merge branch 'master' into kris/sendgrid_subuser

update messages
update web
--- a/bubble-server/src/main/resources/messages
+++ b/bubble-server/src/main/resources/messages
@@ -1 +1 @@
 Subproject commit 60141c5e7d5ddc06abd37dd2b7ae1552bb84c529
 Subproject commit eda2d6b8596a794c1082086ad80934538c8437b9
--- a/+ 1
+++ b/+ 1
@@ -1 +1 @@
 Subproject commit 6297f0ba1966f9db3d5bec9f65ca4ad2b21fe2c6
 Subproject commit cb85ff5267be02bcf632ba69b362b44339cdb32e
--- a/utils/cobbzilla-parent
+++ b/utils/cobbzilla-parent
@@ -1 +1 @@
 Subproject commit 2324f5d196fa52931f07e85c830bf9c10465b8f8
 Subproject commit e1517a9194e104c3ae903cd90f89652ab095bec1
作者	SHA1	备注	提交日期
Kristijan Mitrovic	bc57c03512	Merge branch 'master' into kris/sendgrid_subuser	4 年前
Jonathan Cobb	bd81f744eb	update messages	4 年前
Jonathan Cobb	955878a941	update web	4 年前
Jonathan Cobb	39bf5b6e26	update web	4 年前
Jonathan Cobb	14729db7e9	update web, update jackson	4 年前
Jonathan Cobb	6db052d203	update messages	4 年前
Jonathan Cobb	ddc2c3a7fe	update messages and web	4 年前
Jonathan Cobb	ec1e420f4a	update web	4 年前