Merge branch 'master' into kris/sendgrid_subuser

4 年之前 · 24689ce4dd
--- a/bubble-server/src/main/resources/messages
+++ b/bubble-server/src/main/resources/messages
@@ -1 +1 @@
 Subproject commit eda2d6b8596a794c1082086ad80934538c8437b9
 Subproject commit d5ef2de019ff5bb0b478ffac039ab29132da4e1e
--- a/+ 1
+++ b/+ 1
@@ -1 +1 @@
 Subproject commit cb85ff5267be02bcf632ba69b362b44339cdb32e
 Subproject commit c0fc1fee1e80226829fd8f55ad1f4e13d8908107