summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-12-04 16:09:15 -0500
committerNat Goodspeed <nat@lindenlab.com>2015-12-04 16:09:15 -0500
commitd69a0e692e420e5b95e9bcb4ad1e7c5cfa283468 (patch)
treedba5f50b894e52ad961f599702f3da801e3518b9 /doc
parentc4de6b93d3c3f182fc7bf28e5c285e4d14da0764 (diff)
parent6ed6158ac68076b6a6242a3a74a3394846227e04 (diff)
Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-leap-test
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 7493e96c39..33547a78a1 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -186,6 +186,7 @@ Ansariel Hiller
STORM-1984
STORM-1979
MAINT-5533
+ MAINT-5756
Aralara Rajal
Arare Chantilly
CHUIBUG-191
@@ -767,6 +768,7 @@ Kitty Barnett
STORM-1905
VWR-24217
STORM-1804
+ MAINT-5416
Kolor Fall
Komiko Okamoto
Korvel Noh