summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-02 14:02:46 -0500
committerOz Linden <oz@lindenlab.com>2010-12-02 14:02:46 -0500
commit20e192029ceaf7e9b6d097d6e65089d9011a4c0b (patch)
tree3687b1fdf97d058e75565306c3214fc967839257 /doc
parentfbfe7418e567b79c60cc873a8882d9be97e3bb0a (diff)
parent5098ca5ae444ca492bc668fbd07976e96eb5726a (diff)
merge fix for STORM-596
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 6b56fbfd7c..f3f2d87954 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -769,16 +769,16 @@ WolfPup Lowenhar
STORM-102
STORM-103
STORM-143
+ STORM-255
+ STORM-256
STORM-535
STORM-544
STORM-654
+ STORM-674
VWR-20741
VWR-20933
Zai Lynch
VWR-19505
-Wolfpup Lowenhar
- STORM-255
- STORM-256
Zarkonnen Decosta
VWR-253
Zi Ree