summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-06-14 18:20:55 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-06-14 18:20:55 -0400
commit4dba69b04ab9825f1cd4b8dbf855494a3897ffd7 (patch)
tree2f3a5324daf25ccea323ce5caa8dc238b6e37bbe /doc
parent9b7640d70ae820a954634ecf0dae43dfb33c0d3a (diff)
parent67f6625c56406604197507c842496f031eb0986f (diff)
Automated merge with file:///Users/nat/linden/viewer-no-vstool
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e67df2453e..90bbb1c2c6 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -218,6 +218,7 @@ Ansariel Hiller
MAINT-7899
STORM-2105
STORM-2151
+ MAINT-6917
MAINT-8085
Aralara Rajal
Arare Chantilly