summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-12-07 14:49:27 -0500
committerOz Linden <oz@lindenlab.com>2011-12-07 14:49:27 -0500
commit7457a3eb7a95dbc2f987e3943b154139701711bc (patch)
treebdac7271919dfa76653f32f90e4e25027eda3039 /doc
parentb6e21f1c49dc1c3fa2208ed92740342dc78f08fc (diff)
parentcbfec00c6e4ab2930901900d5c97356069fb4688 (diff)
merge changes for vmrg-199
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 454a1e90ea..274632a804 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -171,7 +171,7 @@ Ansariel Hiller
VWR-25480
VWR-26150
STORM-1685
- STORM-1717
+ STORM-1713
Aralara Rajal
Ardy Lay
STORM-859
@@ -584,6 +584,7 @@ Jonathan Yap
STORM-1639
STORM-910
STORM-1642
+ STORM-591
STORM-1105
STORM-1679
STORM-1222
@@ -592,6 +593,8 @@ Jonathan Yap
STORM-1685
STORM-1721
STORM-1719
+ STORM-1712
+ STORM-1728
Kadah Coba
STORM-1060
Jondan Lundquist
@@ -926,6 +929,7 @@ Robin Cornelius
SNOW-599
SNOW-747
STORM-422
+ STORM-591
STORM-960
STORM-1019
STORM-1095