From 58069ff7dca800984bba379c3fb11117d578c0a4 Mon Sep 17 00:00:00 2001
From: Jason Blais <13119842+jasonblais@users.noreply.github.com>
Date: Thu, 25 Mar 2021 05:43:11 -0400
Subject: [PATCH] Update to correct mailing address in outgoing server and
 portal email (#17223)

* Update cloud_welcome_email.html

* Update en.json
---
 i18n/en.json                       | 4 ++--
 templates/cloud_welcome_email.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index ec280f2682a..20e7b4fe77f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2752,7 +2752,7 @@
   },
   {
     "id": "api.templates.copyright",
-    "translation": "© 2020 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301"
+    "translation": "© 2021 Mattermost, Inc. 530 Lytton Avenue, Second floor, Palo Alto, CA, 94301"
   },
   {
     "id": "api.templates.deactivate_body.info",
@@ -2804,7 +2804,7 @@
   },
   {
     "id": "api.templates.email_footer_v2",
-    "translation": "© 2020 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301"
+    "translation": "© 2021 Mattermost, Inc. 530 Lytton Avenue, Second floor, Palo Alto, CA, 94301"
   },
   {
     "id": "api.templates.email_info1",
diff --git a/templates/cloud_welcome_email.html b/templates/cloud_welcome_email.html
index 49b937c4b80..e94f62ce618 100644
--- a/templates/cloud_welcome_email.html
+++ b/templates/cloud_welcome_email.html
@@ -152,7 +152,7 @@
                                 <td>
                                     <p
                                         style="font-family: Open Sans; font-style: normal; font-weight: 400; font-size: 12px; line-height: 16px; text-align: center; color: rgba(61, 60, 64, 0.56);">
-                                        © 2020 Mattermost, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301
+                                        © 2021 Mattermost, Inc. 530 Lytton Avenue, Second floor, Palo Alto, CA, 94301
                                     </p>
                                 </td>
                             </tr>