summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-11-21 14:08:38 -0500
committerOz Linden <oz@lindenlab.com>2013-11-21 14:08:38 -0500
commit45bc601563337b99ca3dc0d733196d7a00dd54d7 (patch)
tree2d49bf2ce2589947d1b80770f5fa7a312a1f908b /doc
parent4f2a7167b6d6b3b278b39ea7b97beb89f6abb5ee (diff)
parent787ccaf297e81291469aaf269f563d862fb150a3 (diff)
merge changes for 3.6.11-release
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 4ffe6490d5..46ca3826d6 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1190,6 +1190,7 @@ TankMaster Finesmith
STORM-1258
STORM-1602
STORM-1868
+ STORM-1950
VWR-26622
VWR-29224
Talamasca