summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-04 18:01:05 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-04 18:01:05 +0200
commitb68a05e7c30930976ed1273b4c7a0fec01d2a84f (patch)
tree03ababecc49376c0e607b3548d9beb596f79c3a7 /doc/contributions.txt
parentd47c6536820d1ed6e373147678dd0fab90e80ab8 (diff)
parent701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff)
Merge branch 'main' into marchcat/x-merge
# Conflicts: # indra/llcommon/llstring.cpp # indra/llcommon/llstring.h
Diffstat (limited to 'doc/contributions.txt')
-rwxr-xr-xdoc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 0f3cd12f36..711439ad06 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -239,6 +239,8 @@ Ansariel Hiller
SL-15398
SL-18432
SL-19140
+ SL-19575
+ SL-19623
SL-4126
SL-20224
SL-20524
@@ -900,6 +902,7 @@ Kitty Barnett
STORM-2149
MAINT-7581
MAINT-7081
+ DRTVWR-489 (Internal JIRA that tracks Kitty's sizeable, epic contribution: support for Emoji characters in the Viewer [April 2023])
SL-18988
Kolor Fall
Komiko Okamoto