summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-11-21 15:35:25 -0500
committerOz Linden <oz@lindenlab.com>2013-11-21 15:35:25 -0500
commit915ade1029eb39fcd8f3b997b4b8cf2b394c1eb9 (patch)
tree577c0d98b21d05f0b6f28241f2ab2b7ee31f8618 /doc
parentdd7b0f96157bdfbdd8892cc8aa209182ae777380 (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 99527c0587..2f9d0c2c86 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1184,6 +1184,7 @@ TankMaster Finesmith
STORM-1258
STORM-1602
STORM-1868
+ STORM-1950
VWR-26622
VWR-29224
Talamasca