summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-23 12:49:02 -0500
committerOz Linden <oz@lindenlab.com>2011-11-23 12:49:02 -0500
commitd7d779f8aa841b5550d4049dd65c097a3c267f3d (patch)
treefa2e38f1eb82428c8e77a4aa2c3e1dcdf6295763 /doc
parent039417fc7dace6ba4b1f13de93f76b9749b26d41 (diff)
parent3212b741663e3cb8608bb432623968c568e626b5 (diff)
merge changes for vmrg-190
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2b39e15e2a..8d30c21f90 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -170,6 +170,7 @@ Ansariel Hiller
STORM-1101
VWR-25480
VWR-26150
+ STORM-1685
Aralara Rajal
Ardy Lay
STORM-859
@@ -583,9 +584,11 @@ Jonathan Yap
STORM-910
STORM-1642
STORM-1105
+ STORM-1679
STORM-1222
STORM-1659
STORM-1674
+ STORM-1685
Kadah Coba
STORM-1060
Jondan Lundquist
@@ -1114,6 +1117,7 @@ Tofu Buzzard
CTS-411
STORM-546
VWR-24509
+ STORM-1684
Tony Kembia
Torben Trautman
TouchaHoney Perhaps