summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-28 09:20:13 -0400
committerOz Linden <oz@lindenlab.com>2011-06-28 09:20:13 -0400
commit23d3b834bb6fb8d269f4e80d94f9c88774464f17 (patch)
treedd95441bf60508dfaa053b9d8bc4cf24af715fcb /doc
parent2a789e9c50cde72d20d31127059f0338ea967f89 (diff)
parente2a531791ed2c311e6e95061175ce2a9151ccf9d (diff)
merge changes for storm-1334
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 b744f4db3e..2c140bcaed 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -443,6 +443,7 @@ Jonathan Yap
STORM-1236
STORM-1259
STORM-787
+ STORM-1334
STORM-1313
STORM-899
STORM-1273