summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-29 09:52:43 -0400
committerOz Linden <oz@lindenlab.com>2011-06-29 09:52:43 -0400
commit060d2f3c5ef1eb6882fe4f69fcde2471138542c8 (patch)
treeae4a75a66dface204758f32b6f8cfbb2d0bd9b44 /doc
parent1049468d932d6d97bdb880a22eaa809c61508be0 (diff)
parent0ec675b7d1f6f7de231b2c9907ae5fe18a94d9ae (diff)
merge changes for storm-1292
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 256c39eb9e..da60b9e47f 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -449,6 +449,7 @@ Jonathan Yap
STORM-1313
STORM-899
STORM-1273
+ STORM-1292
Kage Pixel
VWR-11
Ken March