summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorcallum_linden <callum@lindenlab.com>2017-11-30 14:44:44 -0800
committercallum_linden <callum@lindenlab.com>2017-11-30 14:44:44 -0800
commitdd0d2805e2b495246525f49325c4492b7b57f157 (patch)
tree96ae78468bbe760c4934416764a4cd89cf5ae381 /doc
parent2e3c5ac88a434ee437bc3e68b321d5bd0bcd7cc9 (diff)
parente3a2c5e3217ae74a0277f2e6d4e1e708fe398a1c (diff)
Automated erge with tip of viewer64
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 0b6fcc1626..c98c974e62 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -215,6 +215,7 @@ Ansariel Hiller
MAINT-7028
MAINT-7059
MAINT-6519
+ MAINT-7899
STORM-2105
Aralara Rajal
Arare Chantilly
@@ -825,6 +826,7 @@ Kitty Barnett
MAINT-6568
STORM-2149
MAINT-7581
+ MAINT-7081
Kolor Fall
Komiko Okamoto
Korvel Noh