Integrating github/staging through commit 5f214be

This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -21,10 +21,10 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
namespace {
QString feedbackText = "<h3>We love getting feedback from our customers.</h3>"
"Feedback from our community helps us to constantly improve Lumberyard.<br/><br/>"
"Feedback from our community helps us to constantly improve Open 3D Engine.<br/><br/>"
"In addition to using our forums and AWS support channels, you can always email us with your comments and suggestions at "
"<a href=\"mailto:lumberyard-feedback@amazon.com\" style=\"color: #4285F4;\">lumberyard-feedback@amazon.com</a>. "
"While we do not respond to everyone who submits feedback, we read everything and aspire to use your feedback to improve Lumberyard for everyone.";
"<a href=\"mailto:o3de-feedback@amazon.com\" style=\"color: #4285F4;\">o3de-feedback@amazon.com</a>. "
"While we do not respond to everyone who submits feedback, we read everything and aspire to use your feedback to improve Open 3D Engine for everyone.";
}