summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-12 11:31:40 -0400
committerOz Linden <oz@lindenlab.com>2011-09-12 11:31:40 -0400
commit84a53eb5477d4ab6782f0f21a9558482f7b66b6b (patch)
tree24a82c1a993a1552d7762bcc0c28102dad5e7f62 /doc
parent1d726db71880579a04b70ca9583f723b552a3347 (diff)
parent4e220af01d9b44807abd94f6cfaf3d865b70b893 (diff)
merge changes for storm-1297
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 5930bab04f..cbc57d211c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -568,6 +568,7 @@ Jonathan Yap
STORM-1276
STORM-1462
STORM-1459
+ STORM-1297
STORM-1522
STORM-1567
STORM-1572