Skip to content

Commit

Permalink
Merge branch 'aiccra-staging' into aiccra-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
kenjitm committed Apr 23, 2024
2 parents 0b33a86 + 182a6bc commit bc98f43
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions marlo-web/src/main/resources/global.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5461,6 +5461,7 @@ tipParameter.tipStatusService= Status Service Endpoint
tipParameter.tokenValue= Token Value
tipParameter.updateToken= Update Token
tipParameter.tokenDueDate= Token Due Date
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.
Expand Down

0 comments on commit bc98f43

Please sign in to comment.