summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2023-10-03 19:11:06 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2023-10-03 19:25:19 +0300
commitd4123ec30d9a5daa96b28f2b8a3cc36ccd7e9cb1 (patch)
treeddbaeb2e54ec30877a306eb7b355a787a56b3d32 /doc
parent51f904e4a7d7e5d04be09991f859bd1b26f0d7ae (diff)
parent2465470817957c8378e81ec1a7e32551fbac7b26 (diff)
Merge branch 'main' into DRTVWR-587-maint-V
# Conflicts: # indra/newview/llinventorymodel.cpp # indra/newview/llvovolume.cpp
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index a3ccba8445..487f61699d 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -237,6 +237,7 @@ Ansariel Hiller
SL-15227
SL-15398
SL-18432
+ SL-19140
SL-4126
SL-20224
Aralara Rajal
@@ -895,6 +896,7 @@ Kitty Barnett
STORM-2149
MAINT-7581
MAINT-7081
+ SL-18988
Kolor Fall
Komiko Okamoto
Korvel Noh