summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-29 19:22:26 -0400
committerOz Linden <oz@lindenlab.com>2011-03-29 19:22:26 -0400
commitb595bbcf2af03b2a285c2df450379b670bddbfbc (patch)
tree121ab3e96f6e72d53c5a4f84d761f13e1996bbda /doc
parentfbd241da54ad6017825b59c5b0c71086d8b8957a (diff)
parent7cb4f2d87dc8619d8ad86cb82f6687f1a9821a69 (diff)
merge changes for storm-1019
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 1cd46ea458..f59539d94c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -413,6 +413,7 @@ Jonathan Yap
STORM-1019
STORM-1020
STORM-1064
+ STORM-1077
Kage Pixel
VWR-11
Ken March