summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-11-30 11:42:49 -0800
committerRider Linden <rider@lindenlab.com>2017-11-30 11:42:49 -0800
commit1df10afa2a7802763330475e1a90547c3cff7c06 (patch)
tree8a8cdb8c02f1e18e8cfacefc1efbc2ab43c6157e /doc
parentd7dd10b88bc3fda88f6528ecc5936e4889f019f3 (diff)
parente3a2c5e3217ae74a0277f2e6d4e1e708fe398a1c (diff)
Merge
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