summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorCallum Linden <callum@lindenlab.com>2022-10-24 17:48:16 -0700
committerCallum Linden <callum@lindenlab.com>2022-10-24 17:48:16 -0700
commit80585d56fd6ccb0875c6353c7620a8ada749d66d (patch)
tree139699b14e49609532ca717f9086f2039795801e /doc
parentb0d69a20c262441125261c4949e59a8a1b9e9628 (diff)
parente45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff)
Merge master into DRTVWR-568 (and fix conflicts)
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 86b42a5ff0..5ead9daaec 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -401,6 +401,7 @@ Cinder Roxley
STORM-2127
STORM-2144
SL-3404
+ SL-17634
Clara Young
Coaldust Numbers
VWR-1095
@@ -1123,6 +1124,7 @@ Nicky Dasmijn
SL-16438
SL-17218
SL-17238
+ SL-17585
Nicky Perian
OPEN-1
STORM-1087