summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-29 09:53:34 -0400
committerOz Linden <oz@lindenlab.com>2011-06-29 09:53:34 -0400
commit4425f9b8217bcd6515412e4d6e1b885d79b08a9a (patch)
treea9b1f8600bffe1f69a52d37de3a27c2080e0c7d3 /doc
parent060d2f3c5ef1eb6882fe4f69fcde2471138542c8 (diff)
parentd66545d17ff1aa30a3840928fa38a919ddec0a53 (diff)
merge changes for storm-1326
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 da60b9e47f..93cb035d89 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -450,6 +450,7 @@ Jonathan Yap
STORM-899
STORM-1273
STORM-1292
+ STORM-1326
Kage Pixel
VWR-11
Ken March