summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-06-28 11:02:11 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-06-28 11:02:11 -0400
commit726851b039b0b0e7d623970f32b6b28616a07dc8 (patch)
tree01dd9d23638486031dcc49d201c35d8338091794 /doc
parente9d2f57866e7e4dcb46b21bef525eb9955691578 (diff)
parent6f8b812ecd73bf25d44445e1b791f9e1b01f429f (diff)
DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen
to resolve conflicts in installer_template.nsi
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8dbf2c8b12..d1ba28acd2 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -237,6 +237,7 @@ Ansariel Hiller
SL-15227
SL-15398
SL-18432
+ SL-4126
Aralara Rajal
Arare Chantilly
CHUIBUG-191
@@ -282,8 +283,12 @@ Beq Janus
SL-11300
SL-15709
SL-16021
+ SL-18202
+ SL-18586
SL-18592
SL-18637
+ SL-19317
+ SL-19660
Beth Walcher
Bezilon Kasei
Biancaluce Robbiani