summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-12-20 10:39:06 -0500
committerOz Linden <oz@lindenlab.com>2011-12-20 10:39:06 -0500
commitb022ebf13c9a227f87a112419e237894a1231c8c (patch)
tree6d1ca1b205b92a07da124dac9730b67ca9e00dc4 /doc
parent2667c6a80f70a2b3ca620184e109910933b10819 (diff)
parentfdc223287ce25ffcb8a43936633eac2eac19b728 (diff)
merge changes for storm-1734
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 3b17a2bdf0..1a3fc680bc 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -598,6 +598,7 @@ Jonathan Yap
STORM-1712
STORM-1728
STORM-1736
+ STORM-1734
STORM-1731
STORM-653
STORM-1737