summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-12-07 14:47:05 -0500
committerOz Linden <oz@lindenlab.com>2011-12-07 14:47:05 -0500
commitb6e21f1c49dc1c3fa2208ed92740342dc78f08fc (patch)
treebd5f9f47f9a82f253cbf65d1ad8327c3bb93918d /doc
parentda0554bf4486a866eb6a37e39c849d1d07ef5324 (diff)
parentda856bb5b65c2d7a91e46c52e69fbf3e6b5b525d (diff)
merge changes for vmrg-198
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9f6de781b4..454a1e90ea 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -171,6 +171,7 @@ Ansariel Hiller
VWR-25480
VWR-26150
STORM-1685
+ STORM-1717
Aralara Rajal
Ardy Lay
STORM-859
@@ -589,6 +590,8 @@ Jonathan Yap
STORM-1659
STORM-1674
STORM-1685
+ STORM-1721
+ STORM-1719
Kadah Coba
STORM-1060
Jondan Lundquist