summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-12-12 15:51:43 -0500
committerOz Linden <oz@lindenlab.com>2013-12-12 15:51:43 -0500
commitdec487cd7f04f00d4aa6428d190ffbf978ea57da (patch)
treed96cda0e2f03c1cf5b1f7ffcdd564690e0ab2cad /doc
parentc9775dde6249582f0e8976be15e72bfebc4ac3fc (diff)
parent1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff)
merge changes for 3.6.12-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 e0fbf3787e..d5abca829a 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1185,6 +1185,7 @@ TankMaster Finesmith
STORM-1258
STORM-1602
STORM-1868
+ STORM-1950
VWR-26622
VWR-29224
Talamasca