summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-02 14:08:23 -0500
committerOz Linden <oz@lindenlab.com>2010-12-02 14:08:23 -0500
commit375d91019eefa0f2bc4f4685fb0f34dac987b189 (patch)
treec4bbed389b33de9dc8fbc746bccccb6545307ad6 /doc
parent732b1f748eb1844eb97ab2293ebc3b1bebb0c9e7 (diff)
parent20e192029ceaf7e9b6d097d6e65089d9011a4c0b (diff)
merge fix for STORM-679
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 94c9ba709f..2334aeb17b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -357,6 +357,7 @@ Jonathan Yap
VWR-17801
STORM-616
STORM-679
+ STORM-596
Kage Pixel
VWR-11
Ken March