summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-12-06 11:30:27 -0500
committerDebi King (Dessie) <dessie@lindenlab.com>2011-12-06 11:30:27 -0500
commit97a92deb18d09e030c0800107204d9776a3c6229 (patch)
tree16133351b0822937c5da1e7009e80e3157119d59 /doc
parentae2a1ea9f10dc9bf3cc5ef59f1428ea1e5fa6495 (diff)
parent95850eddfd26e85dcfa1dd6f71233b6e0bf08253 (diff)
reconciled .hgtags
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2b39e15e2a..9f6de781b4 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,9 @@ Tofu Buzzard
CTS-411
STORM-546
VWR-24509
+ STORM-1684
+ SH-2477
+ STORM-1684
Tony Kembia
Torben Trautman
TouchaHoney Perhaps