summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-03-01 11:15:53 -0500
committerNat Goodspeed <nat@lindenlab.com>2024-03-01 11:15:53 -0500
commitb242d696ba03f66494dfca1f05a74ed1b15cd6e4 (patch)
tree9c432e679ce270642bbca587f3c9c9a36b348bc1 /doc
parent19b808316b7d4095905baf6ff9f26e3045a86fcd (diff)
parent701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff)
Merge branch 'main' of github.com:secondlife/viewer
on promotion of DRTVWR-489 Emoji viewer.
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index a097aad7f6..c902a11874 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
Aralara Rajal
@@ -898,6 +900,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