Merge branch 'aiccra-staging' into AICCRA

CCAFS · Sep 5, 2024 · 0109a03 · 0109a03
2 parents fc865e1 + df6489e
commit 0109a03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties
@@ -5351,6 +5351,7 @@ tipParameter.tokenDueDate= Token Due Date
 tipParameter.emailSubject= Email subject
 tipParameter.tipEmail= TIP Team Email
 tipParameter.emailText= Email body
+tipParameter.tipEncryptionKey= Encryption Key
 
 # Button Guide Management
 buttonGuideManagement.title=Button Guide Management

diff --git a/marlo-web/src/main/resources/global.properties b/marlo-web/src/main/resources/global.properties
@@ -5475,6 +5475,7 @@ tipParameter.tokenDueDate= Token Due Date
 tipParameter.emailSubject= Email subject
 tipParameter.tipEmail= TIP Team Email
 tipParameter.emailText= Email body
+tipParameter.tipEncryptionKey= Encryption Key
 
 # Timeline Management
 timelineManagement.help=Please note that activities are displayed on the homepage timeline component in the order they are entered or in the order defined by the <em>order</em> field, if its filled. By default, the dates of the activities do not determine their order.