summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-05-16 01:08:13 +0300
committerGitHub <noreply@github.com>2024-05-16 01:08:13 +0300
commitd41e167aa9a22b446cbcfe6fd4ebdd810c61ba73 (patch)
tree3ed50d019b3d78c748ed6b46ca69f2ca7943f41a /doc
parent29be88d60d654193926add496d2d851f7c217356 (diff)
parentbdb8caf790207e1a6f46d495a586b38bb52e58e9 (diff)
Merge pull request #1478 from secondlife/marchcat/x-mf-merge
Maint X -> Materials Featurette merge
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 15aec5e282..024ca90d2f 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -245,7 +245,8 @@ Ansariel Hiller
SL-19623
SL-4126
SL-20224
- https://github.com/secondlife/viewer/issues/1051
+ SL-20524
+ secondlife/viewer#1051
Aralara Rajal
Arare Chantilly
CHUIBUG-191
@@ -389,6 +390,7 @@ Chaser Zaks
BUG-225599
BUG-227485
SL-16874
+ SL-20442
Cherry Cheevers
ChickyBabes Zuzu
Chorazin Allen