summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-11 20:06:05 -0400
committerOz Linden <oz@lindenlab.com>2011-05-11 20:06:05 -0400
commit5ffde6fa6dd94bc717971ccece3e22bec974ca60 (patch)
tree78b8a1912f19ad6b6f21d983d061266b3cb27ffe /doc
parent09bdefabc6a1eaf1b9c33e411966c241e2792920 (diff)
parent86180db1f1f3f9c86e1a69f278af95ae05ca1156 (diff)
merge changes for storm-1236
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 09fca27f43..7e9960e594 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -431,6 +431,7 @@ Jonathan Yap
STORM-1128
STORM-956
STORM-1095
+ STORM-1236
Kage Pixel
VWR-11
Ken March