summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-30 06:37:25 -0400
committerOz Linden <oz@lindenlab.com>2011-06-30 06:37:25 -0400
commitce93fc7fd5175716161aa85cfc75e1be76d0e317 (patch)
treee1420320fb484746c5e4431ed78def48f7d7121b /doc
parenta80c79097d24133a9ff9ce6288a2ace506ef0946 (diff)
parent173ef3b2c03bbb55cebd5cf70ce231944d427999 (diff)
merge changes for storm-1396
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 59c6786a51..ab1c7ea1ef 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -450,6 +450,7 @@ Jonathan Yap
STORM-899
STORM-1273
STORM-457
+ STORM-1396
STORM-1292
STORM-1392
STORM-1302