summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-29 09:54:27 -0400
committerOz Linden <oz@lindenlab.com>2011-06-29 09:54:27 -0400
commita300902494f76b9542c3978c2ca80726cefbc942 (patch)
tree64ee663ef9e3436eb40756f494a2f0f158a9fc57 /doc
parent4425f9b8217bcd6515412e4d6e1b885d79b08a9a (diff)
parent9a40b84beded2bb0d0d2adb062b1611bdeb756ed (diff)
merge changes for storm-1302
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 93cb035d89..729c73f777 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -450,6 +450,7 @@ Jonathan Yap
STORM-899
STORM-1273
STORM-1292
+ STORM-1302
STORM-1326
Kage Pixel
VWR-11