summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-30 06:36:25 -0400
committerOz Linden <oz@lindenlab.com>2011-06-30 06:36:25 -0400
commita80c79097d24133a9ff9ce6288a2ace506ef0946 (patch)
treed637fa2f144fcf8a13fe135521d4c32d10c3e73d /doc
parentd3a7792703028531618f8516110f13bb599b13ea (diff)
parentf23d6c22b4b2451c68ee49ae8d66f4ac8be68b64 (diff)
merge changes for storm-457
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 59147d69a4..59c6786a51 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -449,6 +449,7 @@ Jonathan Yap
STORM-1313
STORM-899
STORM-1273
+ STORM-457
STORM-1292
STORM-1392
STORM-1302