summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-21 09:11:01 -0500
committerOz Linden <oz@lindenlab.com>2011-11-21 09:11:01 -0500
commit052d8a8f2eeb4501a62096e2565f377a03f6a609 (patch)
treee5c5230a5da7d24fcd536883a7b3bb4deac12717 /doc
parent8fef9576189f6e3bfb2e1ec0bc2b770186f26c5d (diff)
parent93e3617e8b409a7517f04b3607080f11274a5fd9 (diff)
merge changes for storm-1679
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 e491df284e..171b791a61 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -584,6 +584,7 @@ Jonathan Yap
STORM-910
STORM-1642
STORM-1105
+ STORM-1679
STORM-1222
STORM-1659
STORM-1674