summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-01 13:26:20 -0400
committerOz Linden <oz@lindenlab.com>2012-05-01 13:26:20 -0400
commit5d92c60a4a4707eb18d9932afd01b196792830a2 (patch)
treece5da851a9ef20a598456b6f21c1068a2b6f8803 /doc
parentd6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff)
parentbea4733193121a3918269101ba68fd7282e158ae (diff)
merge changes for storm-1842
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3851e62cfb..5c2d024af7 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -621,6 +621,7 @@ Jonathan Yap
STORM-1799
STORM-1796
STORM-1807
+ STORM-1842
STORM-1808
STORM-1809
STORM-1793
@@ -1280,6 +1281,7 @@ Zi Ree
VWR-24017
VWR-25588
STORM-1790
+ STORM-1842
Zipherius Turas
VWR-76
VWR-77